Changeset 856


Ignore:
Timestamp:
Dec 2, 2008, 8:55:41 AM (14 years ago)
Author:
Jari Häkkinen
Message:

Refs #50 and #63. All WeNNI build options now works. make distcheck now fails on uninstal test.

Location:
plugins/base1/se.lu.thep.wenni/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • plugins/base1/se.lu.thep.wenni/trunk/INSTALL

    r854 r856  
    145145    }}}
    146146    The default plug-in installation directory is the directory
    147     plugins/se/lu/thep/wenni rooted in `basedir`.
     147    plugins/se/lu/thep/wenni rooted in `basedir`. If you prefer to
     148    install the plug-in manually you must place `nni`, `WeNNI.jar`,
     149    and `PluginUtilities-0.1pre.jar` in the same installation
     150    directory.
    148151    [[br]] [[br]]
    149152    If you prefer to compile WeNNI Java wrapper using your local BASE2
  • plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am

    r853 r856  
    3030JAR  = WeNNI.jar
    3131
     32if DOWNLOADBASEAPI
     33DOWNLOADDEP=BaseCoreAPI
     34endif
    3235
    3336all-local: $(JAR)
     
    3639
    3740distclean-local: clean-local
    38   @( rm -rf $(PLUGINutilities) $(PLUGINutilities).tgz )
     41  @( rm -rf $(DOWNLOADDEP) $(PLUGINutilities) $(PLUGINutilities).tgz )
    3942
    4043install-exec-local: $(JAR)
     
    5053  $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(PLUGINDIR)"
    5154
    52 $(JAR): $(BUILDDIR) $(PLUGINutilities) $(CLASS)
     55$(JAR): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS)
    5356  @echo Creating $(JAR)
    5457  @(cd $(TOPBUILDDIR) ; \
     
    6467  @$(MKDIR_P) $@
    6568
     69BaseCoreAPI:
     70  $(MKDIR_P) $@
     71  ( cd $@ ; \
     72    wget $(BASE2CoreURL)/BASE2Core.jar ; \
     73    wget $(BASE2CoreURL)/BASE2CorePlugins.jar )
     74
    6675$(PLUGINutilities): $(PLUGINutilities).tgz
    6776  tar zxpf $<
  • plugins/base1/se.lu.thep.wenni/trunk/configure.ac

    r855 r856  
    3535AC_CONFIG_AUX_DIR([autotools])
    3636AC_PREFIX_DEFAULT([/usr/local])
     37
     38# Build configuration parameters, change only if you know what you do
     39BASE2CoreURL="http://base2.thep.lu.se/base/jars/2.9.0"
     40PLUGINutilitiesURL="http://baseplugins.thep.lu.se/attachment/wiki/net.sf.basedb.pluginutilties/PluginUtilities-0.1pre.tgz?format=raw"
     41PLUGINutilities=PluginUtilities-0.1pre
    3742
    3843AM_CONFIG_HEADER([config.h])
     
    9499AC_ARG_WITH(basedir,[AS_HELP_STRING([--with-basedir=DIR],
    95100                                    [root directory for base installation])],
    96             [BASEDIR=$withval DOWNLOADBASE2API=false],[BASEDIR=/usr/local/base])
     101            [BASEDIR=$withval DOWNLOADBASE2API=false],
     102            [BASEDIR=/usr/local/base DOWNLOADBASE2API=true])
    97103
    98104AC_ARG_WITH(plugindir,[AS_HELP_STRING([--with-plugindir=DIR],
     
    133139                  [AC_MSG_FAILURE([cannot find BASE2CorePlugins.jar])])
    134140    JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS"
     141  else
     142    JAVACFLAGS="./BaseCoreAPI/BASE2CorePlugins.jar:BaseCoreAPI/BASE2Core.jar:$JAVACFLAGS"
    135143  fi
    136   PLUGINutilitiesURL="http://baseplugins.thep.lu.se/attachment/wiki/net.sf.basedb.pluginutilties/PluginUtilities-0.1pre.tgz?format=raw"
    137   PLUGINutilities=PluginUtilities-0.1pre
    138144  JAVACFLAGS="$JAVACFLAGS:./$PLUGINutilities/$PLUGINutilities.jar"
    139145  AC_SUBST(PLUGINutilities)
    140146  AC_SUBST(PLUGINutilitiesURL)
     147  AM_CONDITIONAL([DOWNLOADBASEAPI], [test $DOWNLOADBASE2API = true])
     148  AC_SUBST(BASE2CoreURL)
    141149  AC_SUBST(JAVACFLAGS)
    142150fi
     
    202210  AC_MSG_NOTICE([If not already done, downloading])
    203211  AC_MSG_NOTICE([    $PLUGINutilitiesURL])
    204   AC_MSG_NOTICE([])
    205212  if (test $DOWNLOADBASE2API = true ); then
    206     AC_MSG_NOTICE([Downloading required BASE2 API from ...])
     213    AC_MSG_NOTICE([    BASE2 libraries from $BASE2CoreURL])
    207214  else
     215    AC_MSG_NOTICE([])
    208216    AC_MSG_NOTICE([Using local BASE2 API in directory])
    209217    AC_MSG_NOTICE([    $BASEDIR])
Note: See TracChangeset for help on using the changeset viewer.