Changeset 10071


Ignore:
Timestamp:
2005-06-13T15:23:11+12:00 (19 years ago)
Author:
kjdon
Message:

the jar file is now made in mghome directory, and nothing is done with it on install

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/packages/mg/java/org/greenstone/mg/Makefile.in

    r9993 r10071  
    3030
    3131MGHOME=../../../..
    32 JAVALIBDIR=$(libdir)/java
    3332JAVACLASSDIR=./classes
    3433JAVASRCDIR=../../..
    … …  
    5150    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGHOME)/jni org.greenstone.mg.MGWrapper
    5251    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGHOME)/jni org.greenstone.mg.MGPassesWrapper
    53     $(JAR) cf mg.jar -C $(JAVACLASSDIR) org
     52    $(JAR) cf $(MGHOME)/mg.jar -C $(JAVACLASSDIR) org
    5453
    5554clean:
    56     rm -rf $(JAVACLASSDIR) mg.jar $(MGHOME)/jni/org_greenstone_mg_MGWrapper.h $(MGHOME)/jni/org_greenstone_mg_MGPassesWrapper.h
     55    rm -rf $(JAVACLASSDIR) $(MGHOME)/mg.jar $(MGHOME)/jni/org_greenstone_mg_MGWrapper.h $(MGHOME)/jni/org_greenstone_mg_MGPassesWrapper.h
    5756
    58 install: compile
    59     $(MGHOME)/mkinstalldirs $(JAVALIBDIR); \
    60     cp mg.jar $(JAVALIBDIR)/
     57install:
    6158
    6259distclean: clean

  • trunk/gsdl3/packages/mg/java/org/greenstone/mg/winMake.bat

    r9985 r10071  
    3131    %JAVAH% -classpath %JAVACLASSDIR% -d %MGHOME%\jni org.greenstone.mg.MGWrapper
    3232    %JAVAH% -classpath %JAVACLASSDIR% -d %MGHOME%\jni org.greenstone.mg.MGPassesWrapper
    33     %JAR% cf mg.jar -C %JAVACLASSDIR% org
     33    %JAR% cf %MGHOME%\mg.jar -C %JAVACLASSDIR% org
    3434    goto done
    3535
    3636:install
    37     copy mg.jar %GSDL3HOME%\lib\java
    3837    goto done
    3938
    … …  
    4140    echo Cleaning up...
    4241    if exist %JAVACLASSDIR% rmdir /S /Q %JAVACLASSDIR%
    43         if exist mg.jar del mg.jar
     42        if exist %MGHOME%\mg.jar del %MGHOME%\mg.jar
    4443        if exist %MGHOME%\jni\org_greenstone_mg_MGWrapper.h del %MGHOME%\jni\org_greenstone_mg_MGWrapper.h
    4544        if exist %MGHOME%\jni\org_greenstone_mg_MGPassesWrapper.h del %MGHOME%\jni\org_greenstone_mg_MGPassesWrapper.h

  • trunk/gsdl3/src/packages/mg/java/org/greenstone/mg/Makefile.in

    r9993 r10071  
    3030
    3131MGHOME=../../../..
    32 JAVALIBDIR=$(libdir)/java
    3332JAVACLASSDIR=./classes
    3433JAVASRCDIR=../../..
    … …  
    5150    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGHOME)/jni org.greenstone.mg.MGWrapper
    5251    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGHOME)/jni org.greenstone.mg.MGPassesWrapper
    53     $(JAR) cf mg.jar -C $(JAVACLASSDIR) org
     52    $(JAR) cf $(MGHOME)/mg.jar -C $(JAVACLASSDIR) org
    5453
    5554clean:
    56     rm -rf $(JAVACLASSDIR) mg.jar $(MGHOME)/jni/org_greenstone_mg_MGWrapper.h $(MGHOME)/jni/org_greenstone_mg_MGPassesWrapper.h
     55    rm -rf $(JAVACLASSDIR) $(MGHOME)/mg.jar $(MGHOME)/jni/org_greenstone_mg_MGWrapper.h $(MGHOME)/jni/org_greenstone_mg_MGPassesWrapper.h
    5756
    58 install: compile
    59     $(MGHOME)/mkinstalldirs $(JAVALIBDIR); \
    60     cp mg.jar $(JAVALIBDIR)/
     57install:
    6158
    6259distclean: clean

  • trunk/gsdl3/src/packages/mg/java/org/greenstone/mg/winMake.bat

    r9985 r10071  
    3131    %JAVAH% -classpath %JAVACLASSDIR% -d %MGHOME%\jni org.greenstone.mg.MGWrapper
    3232    %JAVAH% -classpath %JAVACLASSDIR% -d %MGHOME%\jni org.greenstone.mg.MGPassesWrapper
    33     %JAR% cf mg.jar -C %JAVACLASSDIR% org
     33    %JAR% cf %MGHOME%\mg.jar -C %JAVACLASSDIR% org
    3434    goto done
    3535
    3636:install
    37     copy mg.jar %GSDL3HOME%\lib\java
    3837    goto done
    3938
    … …  
    4140    echo Cleaning up...
    4241    if exist %JAVACLASSDIR% rmdir /S /Q %JAVACLASSDIR%
    43         if exist mg.jar del mg.jar
     42        if exist %MGHOME%\mg.jar del %MGHOME%\mg.jar
    4443        if exist %MGHOME%\jni\org_greenstone_mg_MGWrapper.h del %MGHOME%\jni\org_greenstone_mg_MGWrapper.h
    4544        if exist %MGHOME%\jni\org_greenstone_mg_MGPassesWrapper.h del %MGHOME%\jni\org_greenstone_mg_MGPassesWrapper.h

  • trunk/indexers/mg/java/org/greenstone/mg/Makefile.in

    r9993 r10071  
    3030
    3131MGHOME=../../../..
    32 JAVALIBDIR=$(libdir)/java
    3332JAVACLASSDIR=./classes
    3433JAVASRCDIR=../../..
    … …  
    5150    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGHOME)/jni org.greenstone.mg.MGWrapper
    5251    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGHOME)/jni org.greenstone.mg.MGPassesWrapper
    53     $(JAR) cf mg.jar -C $(JAVACLASSDIR) org
     52    $(JAR) cf $(MGHOME)/mg.jar -C $(JAVACLASSDIR) org
    5453
    5554clean:
    56     rm -rf $(JAVACLASSDIR) mg.jar $(MGHOME)/jni/org_greenstone_mg_MGWrapper.h $(MGHOME)/jni/org_greenstone_mg_MGPassesWrapper.h
     55    rm -rf $(JAVACLASSDIR) $(MGHOME)/mg.jar $(MGHOME)/jni/org_greenstone_mg_MGWrapper.h $(MGHOME)/jni/org_greenstone_mg_MGPassesWrapper.h
    5756
    58 install: compile
    59     $(MGHOME)/mkinstalldirs $(JAVALIBDIR); \
    60     cp mg.jar $(JAVALIBDIR)/
     57install:
    6158
    6259distclean: clean

  • trunk/indexers/mg/java/org/greenstone/mg/winMake.bat

    r9985 r10071  
    3131    %JAVAH% -classpath %JAVACLASSDIR% -d %MGHOME%\jni org.greenstone.mg.MGWrapper
    3232    %JAVAH% -classpath %JAVACLASSDIR% -d %MGHOME%\jni org.greenstone.mg.MGPassesWrapper
    33     %JAR% cf mg.jar -C %JAVACLASSDIR% org
     33    %JAR% cf %MGHOME%\mg.jar -C %JAVACLASSDIR% org
    3434    goto done
    3535
    3636:install
    37     copy mg.jar %GSDL3HOME%\lib\java
    3837    goto done
    3938
    … …  
    4140    echo Cleaning up...
    4241    if exist %JAVACLASSDIR% rmdir /S /Q %JAVACLASSDIR%
    43         if exist mg.jar del mg.jar
     42        if exist %MGHOME%\mg.jar del %MGHOME%\mg.jar
    4443        if exist %MGHOME%\jni\org_greenstone_mg_MGWrapper.h del %MGHOME%\jni\org_greenstone_mg_MGWrapper.h
    4544        if exist %MGHOME%\jni\org_greenstone_mg_MGPassesWrapper.h del %MGHOME%\jni\org_greenstone_mg_MGPassesWrapper.h
Note: See TracChangeset for help on using the changeset viewer.