Changeset 868
- Timestamp:
- Dec 3, 2008, 10:43:47 PM (14 years ago)
- Location:
- plugins/base1/se.lu.thep.wenni/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am
r866 r868 25 25 SUBDIR = se/lu/thep/wenni 26 26 BUILDDIR = $(TOPBUILDDIR)/$(SUBDIR) 27 MANIFEST_FILE = " $(TOPBUILDDIR)/META-INF/MANIFEST.MF"27 MANIFEST_FILE = "MANIFEST.MF" 28 28 29 29 JAVA = WeNNI.java … … 37 37 all-local: $(WeNNI) 38 38 39 clean-local:; @( rm -rf *.jar *.class *~ $(TOPBUILDDIR) )39 clean-local:; @( rm -rf *.jar *.class *~ $(TOPBUILDDIR) $(MANIFEST_FILE) ) 40 40 41 41 distclean-local: clean-local … … 61 61 $(WeNNI): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS) manifest 62 62 @echo Creating $(WeNNI) 63 @(cd $(TOPBUILDDIR) ; $(JAR) c f../$(WeNNI) .)63 @(cd $(TOPBUILDDIR) ; $(JAR) cmf ../$(MANIFEST_FILE) ../$(WeNNI) .) 64 64 65 65 manifest: $(TOPBUILDDIR) … … 72 72 73 73 $(CLASS): $(BUILDDIR)/$(JAVA) 74 $(JAVAC) -cp $(JAVACFLAGS):$(TOPBUILDDIR) $<74 $(JAVAC) $(JAVACFLAGS) -cp $(JAVACCLASSPATH):$(TOPBUILDDIR) $< 75 75 76 76 $(BUILDDIR): -
plugins/base1/se.lu.thep.wenni/trunk/configure.ac
r864 r868 134 134 AC_PROG_JAVAC 135 135 AC_PROG_JAR 136 JAVACFLAGS="-encoding UTF8" 136 137 if (test $DOWNLOADBASE2API = false); then 137 138 AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2Core.jar], [], 138 139 [AC_MSG_FAILURE([cannot find BASE2Core.jar])]) 139 JAVAC FLAGS+=$BASEDIR/www/WEB-INF/lib/BASE2Core.jar140 JAVACCLASSPATH+=$BASEDIR/www/WEB-INF/lib/BASE2Core.jar 140 141 AC_CHECK_FILE([$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar], [], 141 142 [AC_MSG_FAILURE([cannot find BASE2CorePlugins.jar])]) 142 JAVAC FLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS"143 JAVACCLASSPATH="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACCLASSPATH" 143 144 else 144 JAVAC FLAGS="./BaseCoreAPI/BASE2CorePlugins.jar:BaseCoreAPI/BASE2Core.jar:$JAVACFLAGS"145 JAVACCLASSPATH="./BaseCoreAPI/BASE2CorePlugins.jar:BaseCoreAPI/BASE2Core.jar:$JAVACCLASSPATH" 145 146 fi 146 JAVAC FLAGS="$JAVACFLAGS:./$PLUGINutilities/$PLUGINutilities.jar"147 JAVACCLASSPATH="$JAVACCLASSPATH:./$PLUGINutilities/$PLUGINutilities.jar" 147 148 AC_SUBST(PLUGINutilities) 148 149 AC_SUBST(PLUGINutilitiesURL) 149 150 AC_SUBST(BASE2CoreURL) 150 151 AC_SUBST(JAVACFLAGS) 152 AC_SUBST(JAVACCLASSPATH) 151 153 fi 152 154 … … 241 243 AC_MSG_NOTICE([ BASELDFLAGS = $BASELDFLAGS]) 242 244 elif (test x$state = xbase2); then 243 AC_MSG_NOTICE([ JAVACFLAGS = $JAVACFLAGS]) 245 AC_MSG_NOTICE([ JAVACFLAGS = $JAVACFLAGS]) 246 AC_MSG_NOTICE([ JAVACCLASSPATH = $JAVACCLASSPATH]) 244 247 fi 245 248 AC_MSG_NOTICE([+++++++++++++++++++++++++++++++++++++++++++++++])
Note: See TracChangeset
for help on using the changeset viewer.