Changeset 856

Timestamp:

Dec 2, 2008, 8:55:41 AM (15 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:

• INSTALL (modified) (1 diff)
• base/base2/Makefile.am (modified) (4 diffs)
• configure.ac (modified) (4 diffs)

plugins/base1/se.lu.thep.wenni/trunk/INSTALL

@@ -145 +145 @@
     }}}
     The default plug-in installation directory is the directory
-    plugins/se/lu/thep/wenni rooted in `basedir`.
+    plugins/se/lu/thep/wenni rooted in `basedir`. If you prefer to
+    install the plug-in manually you must place `nni`, `WeNNI.jar`,
+    and `PluginUtilities-0.1pre.jar` in the same installation
+    directory.
     [[br]] [[br]]
     If you prefer to compile WeNNI Java wrapper using your local BASE2

plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am

@@ -30 +30 @@
 JAR  = WeNNI.jar
 
+if DOWNLOADBASEAPI
+DOWNLOADDEP=BaseCoreAPI
+endif
 
 all-local: $(JAR)
@@ -36 +39 @@
 
 distclean-local: clean-local
-  @( rm -rf $(PLUGINutilities) $(PLUGINutilities).tgz )
+  @( rm -rf $(DOWNLOADDEP) $(PLUGINutilities) $(PLUGINutilities).tgz )
 
 install-exec-local: $(JAR)
@@ -50 +53 @@
   $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(PLUGINDIR)"
 
-$(JAR): $(BUILDDIR) $(PLUGINutilities) $(CLASS)
+$(JAR): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS)
   @echo Creating $(JAR)
   @(cd $(TOPBUILDDIR) ; \
@@ -64 +67 @@
   @$(MKDIR_P) $@
 
+BaseCoreAPI:
+  $(MKDIR_P) $@
+  ( cd $@ ; \
+    wget $(BASE2CoreURL)/BASE2Core.jar ; \
+    wget $(BASE2CoreURL)/BASE2CorePlugins.jar )
+
 $(PLUGINutilities): $(PLUGINutilities).tgz
   tar zxpf $<

plugins/base1/se.lu.thep.wenni/trunk/configure.ac

@@ -35 +35 @@
 AC_CONFIG_AUX_DIR([autotools])
 AC_PREFIX_DEFAULT([/usr/local])
+
+# Build configuration parameters, change only if you know what you do
+BASE2CoreURL="http://base2.thep.lu.se/base/jars/2.9.0"
+PLUGINutilitiesURL="http://baseplugins.thep.lu.se/attachment/wiki/net.sf.basedb.pluginutilties/PluginUtilities-0.1pre.tgz?format=raw"
+PLUGINutilities=PluginUtilities-0.1pre
 
 AM_CONFIG_HEADER([config.h])
@@ -94 +99 @@
 AC_ARG_WITH(basedir,[AS_HELP_STRING([--with-basedir=DIR], 
                                     [root directory for base installation])],
-            [BASEDIR=$withval DOWNLOADBASE2API=false],[BASEDIR=/usr/local/base])
+            [BASEDIR=$withval DOWNLOADBASE2API=false],
+            [BASEDIR=/usr/local/base DOWNLOADBASE2API=true])
 
 AC_ARG_WITH(plugindir,[AS_HELP_STRING([--with-plugindir=DIR],
@@ -133 +139 @@
                   [AC_MSG_FAILURE([cannot find BASE2CorePlugins.jar])])
     JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS"
+  else
+    JAVACFLAGS="./BaseCoreAPI/BASE2CorePlugins.jar:BaseCoreAPI/BASE2Core.jar:$JAVACFLAGS"
   fi
-  PLUGINutilitiesURL="http://baseplugins.thep.lu.se/attachment/wiki/net.sf.basedb.pluginutilties/PluginUtilities-0.1pre.tgz?format=raw"
-  PLUGINutilities=PluginUtilities-0.1pre
   JAVACFLAGS="$JAVACFLAGS:./$PLUGINutilities/$PLUGINutilities.jar"
   AC_SUBST(PLUGINutilities)
   AC_SUBST(PLUGINutilitiesURL)
+  AM_CONDITIONAL([DOWNLOADBASEAPI], [test $DOWNLOADBASE2API = true])
+  AC_SUBST(BASE2CoreURL)
   AC_SUBST(JAVACFLAGS)
 fi
@@ -202 +210 @@
   AC_MSG_NOTICE([If not already done, downloading])
   AC_MSG_NOTICE([    $PLUGINutilitiesURL])
-  AC_MSG_NOTICE([])
   if (test $DOWNLOADBASE2API = true ); then
-    AC_MSG_NOTICE([Downloading required BASE2 API from ...])
+    AC_MSG_NOTICE([    BASE2 libraries from $BASE2CoreURL])
   else
+    AC_MSG_NOTICE([])
     AC_MSG_NOTICE([Using local BASE2 API in directory])
     AC_MSG_NOTICE([    $BASEDIR])