Changeset 35458 for main/trunk/search4j/win32.mak

Timestamp:

2021-09-23T18:47:58+12:00 (3 years ago)

Author:

davidb

Message:

Equivalent Windows update of win32.mak for Makefile.in update to support DisplayJavaVersion and DisplayJavaBitness (commit is from Linux, still to be tested under Windows)

File:

• main/trunk/search4j/win32.mak (modified) (4 diffs)

main/trunk/search4j/win32.mak

@@ -53 +53 @@
 LIBS = advapi32.lib
 
+rem ---- Name and location of java programs ----
+JAVAC = javac
+JAR   = jar
+
+set JAVACOPTIONS= -deprecation -g -O
+
+
 COMPILE = $(CC) -c /DWINDOWS $(CXXFLAGS) $(DEFS) $(INCLUDES)
 LINK = $(LINKER) /OUT:$@ $(LDFLAGS)
@@ -66 +73 @@
 EXECUTABLE = search4j.exe
 
-all: $(EXECUTABLE) install
+all: $(EXECUTABLE) install compile-java install-java
 
 search4j.exe: $(EXECUTABLE_OBJECTS) 
@@ -74 +81 @@
     del $(OBJECTS)
     del $(EXECUTABLE)
+    del DisplayJavaVersion.class
+    del DisplayJavaBitness.class
 
 install: $(EXECUTABLE)
@@ -79 +88 @@
     IF NOT EXIST "$(BINDIR)" mkdir "$(BINDIR)"
     copy $(EXECUTABLE) "$(BINDIR)"
+
+compile-java:
+    $(JAVAC) $(JAVACOPTIONS) DisplayJavaVersion.java
+    $(JAVAC) $(JAVACOPTIONS) DisplayJavaBitness.java
+    $(JAR) cvfm display-java-version.jar Manifest-version.txt DisplayJavaVersion.class
+    $(JAR) cvfm display-java-bitness.jar Manifest-bitness.txt DisplayJavaBitness.class
+
+install-java:
+    IF NOT EXIST "$(LIBDIR)\.." mkdir "$(LIBDIR)\.."
+    IF NOT EXIST "$(LIBDIR)" mkdir "$(LIBDIR)"
+    IF NOT EXIST "$(LIBDIR)\java" mkdir "$(LIBDIR)\java"
+    copy display-java-version.jar "$(LIBDIR)\java"
+    copy jna.jar "$(LIBDIR)\java"
+    copy display-java-bitness.jar "$(LIBDIR)\java"