Changeset 10072


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

jar file now made in top level, and nothing done to it on install

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r9993 r10072  
    3030
    3131MGPPHOME=../../../..
    32 JAVALIBDIR=$(libdir)/java
    3332JAVACLASSDIR=./classes
    3433JAVASRCDIR=../../..
    … …  
    5251    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGPPHOME)/jni org.greenstone.mgpp.MGPPPassesWrapper
    5352
    54     $(JAR) cf mgpp.jar -C $(JAVACLASSDIR) org
     53    $(JAR) cf $(MGPPHOME)/mgpp.jar -C $(JAVACLASSDIR) org
    5554
    5655clean:
    57     rm -rf $(JAVACLASSDIR) mgpp.jar $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPWrapper.h $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPPassesWrapper.h
     56    rm -rf $(JAVACLASSDIR) $(MGPPHOME)/mgpp.jar $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPWrapper.h $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPPassesWrapper.h
    5857
    5958install:
    60     $(MGPPHOME)/mkinstalldirs $(JAVALIBDIR); \
    61     cp mgpp.jar $(JAVALIBDIR)/
    6259
    6360distclean: clean

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

    r9985 r10072  
    3030        %JAVAC% -d %JAVACLASSDIR% %JAVACOPTIONS% *.java
    3131        %JAVAH% -classpath %JAVACLASSDIR% -d %MGPPHOME%\jni org.greenstone.mgpp.MGPPWrapper
    32         %JAR% cf mgpp.jar -C %JAVACLASSDIR% org
     32        %JAR% cf %MGPPHOME%\mgpp.jar -C %JAVACLASSDIR% org
    3333    goto done
    3434
    3535:install
    36         copy mgpp.jar %GSDL3HOME%\lib\java
    3736    goto done
    3837
    … …  
    4039    echo Cleaning up...
    4140    if exist %JAVACLASSDIR% rmdir /S /Q %JAVACLASSDIR%
    42         if exist mgpp.jar del mgpp.jar
     41        if exist %MGPPHOME%\mgpp.jar del %MGPPHOME%\mgpp.jar
    4342        if exist %MGPPHOME%\jni\org_greenstone_mgpp_MGPPWrapper.h del %MGPPHOME%\jni\org_greenstone_mgpp_MGPPWrapper.h
    4443    goto done

  • trunk/mgpp/java/org/greenstone/mgpp/Makefile.in

    r9993 r10072  
    3030
    3131MGPPHOME=../../../..
    32 JAVALIBDIR=$(libdir)/java
    3332JAVACLASSDIR=./classes
    3433JAVASRCDIR=../../..
    … …  
    5251    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGPPHOME)/jni org.greenstone.mgpp.MGPPPassesWrapper
    5352
    54     $(JAR) cf mgpp.jar -C $(JAVACLASSDIR) org
     53    $(JAR) cf $(MGPPHOME)/mgpp.jar -C $(JAVACLASSDIR) org
    5554
    5655clean:
    57     rm -rf $(JAVACLASSDIR) mgpp.jar $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPWrapper.h $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPPassesWrapper.h
     56    rm -rf $(JAVACLASSDIR) $(MGPPHOME)/mgpp.jar $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPWrapper.h $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPPassesWrapper.h
    5857
    5958install:
    60     $(MGPPHOME)/mkinstalldirs $(JAVALIBDIR); \
    61     cp mgpp.jar $(JAVALIBDIR)/
    6259
    6360distclean: clean

  • trunk/mgpp/java/org/greenstone/mgpp/winMake.bat

    r9985 r10072  
    3030        %JAVAC% -d %JAVACLASSDIR% %JAVACOPTIONS% *.java
    3131        %JAVAH% -classpath %JAVACLASSDIR% -d %MGPPHOME%\jni org.greenstone.mgpp.MGPPWrapper
    32         %JAR% cf mgpp.jar -C %JAVACLASSDIR% org
     32        %JAR% cf %MGPPHOME%\mgpp.jar -C %JAVACLASSDIR% org
    3333    goto done
    3434
    3535:install
    36         copy mgpp.jar %GSDL3HOME%\lib\java
    3736    goto done
    3837
    … …  
    4039    echo Cleaning up...
    4140    if exist %JAVACLASSDIR% rmdir /S /Q %JAVACLASSDIR%
    42         if exist mgpp.jar del mgpp.jar
     41        if exist %MGPPHOME%\mgpp.jar del %MGPPHOME%\mgpp.jar
    4342        if exist %MGPPHOME%\jni\org_greenstone_mgpp_MGPPWrapper.h del %MGPPHOME%\jni\org_greenstone_mgpp_MGPPWrapper.h
    4443    goto done
Note: See TracChangeset for help on using the changeset viewer.