Changeset 868

Timestamp:

Dec 3, 2008, 10:43:47 PM (13 years ago)

Author:

Jari Häkkinen

Message:

JAVACFLAGS was a classpath! Correcting and introduced a proper JAVACFLAGS, explicitly setting UTF8 encoding needed for öäå. The MANIFEST.MF for WeNN.jar was not properly generated, corrected.

Location:

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

Files:

• base/base2/Makefile.am (modified) (4 diffs)
• configure.ac (modified) (2 diffs)

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

@@ -25 +25 @@
 SUBDIR = se/lu/thep/wenni
 BUILDDIR = $(TOPBUILDDIR)/$(SUBDIR)
-MANIFEST_FILE = "$(TOPBUILDDIR)/META-INF/MANIFEST.MF"
+MANIFEST_FILE = "MANIFEST.MF"
 
 JAVA = WeNNI.java 
@@ -37 +37 @@
 all-local: $(WeNNI)
 
-clean-local:; @( rm -rf *.jar *.class *~ $(TOPBUILDDIR)) 
+clean-local:; @( rm -rf *.jar *.class *~ $(TOPBUILDDIR) $(MANIFEST_FILE) )
 
 distclean-local: clean-local
@@ -61 +61 @@
 $(WeNNI): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS) manifest
   @echo Creating $(WeNNI)
-  @(cd $(TOPBUILDDIR) ; $(JAR) cf ../$(WeNNI) .)
+  @(cd $(TOPBUILDDIR) ; $(JAR) cmf ../$(MANIFEST_FILE) ../$(WeNNI) .)
 
 manifest: $(TOPBUILDDIR)
@@ -72 +72 @@
 
 $(CLASS): $(BUILDDIR)/$(JAVA)
-  $(JAVAC) -cp $(JAVACFLAGS):$(TOPBUILDDIR)  $<
+  $(JAVAC) $(JAVACFLAGS) -cp $(JAVACCLASSPATH):$(TOPBUILDDIR)  $<
 
 $(BUILDDIR):

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

@@ -134 +134 @@
   AC_PROG_JAVAC   
   AC_PROG_JAR   
+  JAVACFLAGS="-encoding UTF8"
   if (test $DOWNLOADBASE2API = false); then
     AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2Core.jar], [],
                   [AC_MSG_FAILURE([cannot find BASE2Core.jar])])
-    JAVACFLAGS+=$BASEDIR/www/WEB-INF/lib/BASE2Core.jar
+    JAVACCLASSPATH+=$BASEDIR/www/WEB-INF/lib/BASE2Core.jar
     AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar], [],
                   [AC_MSG_FAILURE([cannot find BASE2CorePlugins.jar])])
-    JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS"
+    JAVACCLASSPATH="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACCLASSPATH"
   else
-    JAVACFLAGS="./BaseCoreAPI/BASE2CorePlugins.jar:BaseCoreAPI/BASE2Core.jar:$JAVACFLAGS"
+    JAVACCLASSPATH="./BaseCoreAPI/BASE2CorePlugins.jar:BaseCoreAPI/BASE2Core.jar:$JAVACCLASSPATH"
   fi
-  JAVACFLAGS="$JAVACFLAGS:./$PLUGINutilities/$PLUGINutilities.jar"
+  JAVACCLASSPATH="$JAVACCLASSPATH:./$PLUGINutilities/$PLUGINutilities.jar"
   AC_SUBST(PLUGINutilities)
   AC_SUBST(PLUGINutilitiesURL)
   AC_SUBST(BASE2CoreURL)
   AC_SUBST(JAVACFLAGS)
+  AC_SUBST(JAVACCLASSPATH)
 fi
 
@@ -241 +243 @@
   AC_MSG_NOTICE([  BASELDFLAGS  = $BASELDFLAGS])
 elif (test x$state = xbase2); then
-  AC_MSG_NOTICE([  JAVACFLAGS   = $JAVACFLAGS])
+  AC_MSG_NOTICE([  JAVACFLAGS     = $JAVACFLAGS])
+  AC_MSG_NOTICE([  JAVACCLASSPATH = $JAVACCLASSPATH])
 fi
 AC_MSG_NOTICE([+++++++++++++++++++++++++++++++++++++++++++++++])