Ignore:
Timestamp:
2021-09-23T17:15:59+12:00 (11 months ago)
Author:
davidb
Message:

Addition of java-based solution to more cleanly determine Java version and bitness, rather than relying of it's 'version' minus argument and inspecting with 'file' the 'java' program. This commit for Unix OS. A later phase of work will be the updated win32.mak file for Windows. Then a final phase of work will be for the 'search4j' source code to be tied in with the generated jar files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/search4j/Makefile.in

    r29357 r35457  
    2828exec_prefix = @exec_prefix@
    2929bindir = @bindir@
     30libdir = @libdir@
    3031
    3132CXX = @CXX@
     
    3940LIBS = @LIBS@
    4041
     42JAVAC = @JAVAC@
     43JAR = jar
     44JAVACFLAGS = @JAVACFLAGS@
    4145
    4246CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
     
    6569
    6670# Default target: make the search4j executable
    67 all: $(EXECUTABLE)
     71all: $(EXECUTABLE) compile-java install-java
    6872
    6973search4j: $(EXECUTABLE_OBJECTS)
     
    7781clean:
    7882    rm -f $(OBJECTS) $(EXECUTABLE)
     83    rm -f DisplayJavaVersion.class
     84    rm -f DisplayJavaBitness.class
    7985
    8086distclean:
     
    8389depend:
    8490    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
     91
     92compile-java:
     93    $(JAVAC) $(JAVACFLAGS) DisplayJavaVersion.java
     94    $(JAVAC) $(JAVACFLAGS) DisplayJavaBitness.java
     95    $(JAR) cvfm display-java-version.jar Manifest-version.txt DisplayJavaVersion.class
     96    $(JAR) cvfm display-java-bitness.jar Manifest-bitness.txt DisplayJavaBitness.class
     97
     98install-java:
     99    $(INSTALL) -d $(libdir)
     100    $(INSTALL) -d $(libdir)/java
     101    $(INSTALL) display-java-version.jar $(libdir)/java
     102    $(INSTALL) jna.jar $(libdir)/java
     103    $(INSTALL) display-java-bitness.jar $(libdir)/java
Note: See TracChangeset for help on using the changeset viewer.