Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jdk/make/launcher/LauncherCommon.gmk
changeset 34013 79c21cd6fcfc
parent 33523 eb067bcd9414
parent 34012 b8b34f35e2ee
child 34014 1ffce305d533 
--- a/jdk/make/launcher/LauncherCommon.gmk	Thu Nov 12 10:39:06 2015 -0800
+++ b/jdk/make/launcher/LauncherCommon.gmk	Mon Nov 16 17:10:20 2015 -0800
@@ -168,9 +168,7 @@
       OPTIMIZATION := $$($1_OPTIMIZATION), \
       CFLAGS := $$($1_CFLAGS) \
           $(LAUNCHER_CFLAGS) \
-          -DFULL_VERSION='"$(FULL_VERSION)"' \
-          -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
-          -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
+          $(VERSION_CFLAGS) \
           -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
           -DPROGNAME='"$1"' \
           $$($1_CFLAGS), \
@@ -206,7 +204,7 @@
           -D "JDK_FTYPE=0x1L" \
           $$($1_RC_FLAGS), \
       MANIFEST := $(JAVA_MANIFEST), \
-      MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \
+      MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
       CODESIGN := $$($1_CODESIGN), \
   ))
jdk-sandbox