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/makefiles/GensrcMisc.gmk
changeset 20547 453837141fac
parent 20171 099045062d79 
--- a/jdk/makefiles/GensrcMisc.gmk	Wed Oct 09 23:19:08 2013 -0700
+++ b/jdk/makefiles/GensrcMisc.gmk	Thu Oct 10 15:06:21 2013 +0200
@@ -32,16 +32,16 @@
 
 $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
 $(PROFILE_VERSION_JAVA_TARGETS): \
-		$(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template
+    $(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp
 	$(ECHO) Generating sun/misc/Version.java $(call profile_version_name, $@)
 	$(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
-	       -e 's/@@java_version@@/$(RELEASE)/g' \
-	       -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
-	       -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
-	       -e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \
-            $< > $@.tmp
+	    -e 's/@@java_version@@/$(RELEASE)/g' \
+	    -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
+	    -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
+	    -e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \
+	    $< > $@.tmp
 	$(MV) $@.tmp $@
 
 GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
@@ -51,7 +51,7 @@
 # Version file for jconsole
 
 $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java: \
-                $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template
+    $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp
 	$(ECHO) $(LOG_INFO) Generating sun/tools/jconsole/Version.java
@@ -62,21 +62,21 @@
 
 ##########################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS_API),posix)
-    UPSUFFIX:=$(OPENJDK_TARGET_OS)
-    ifeq ($(OPENJDK_TARGET_OS),macosx)
-        UPSUFFIX:=bsd
-    endif
-    # UNIXProcess.java is different for solaris and linux. We need to copy
-    # the correct UNIXProcess.java over to $(JDK_OUTPUTDIR)/gensrc/java/lang/.
+ifeq ($(OPENJDK_TARGET_OS_API), posix)
+  UPSUFFIX := $(OPENJDK_TARGET_OS)
+  ifeq ($(OPENJDK_TARGET_OS), macosx)
+    UPSUFFIX := bsd
+  endif
+  # UNIXProcess.java is different for solaris and linux. We need to copy
+  # the correct UNIXProcess.java over to $(JDK_OUTPUTDIR)/gensrc/java/lang/.
 
-    $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java : \
-              $(JDK_TOPDIR)/src/solaris/classes/java/lang/UNIXProcess.java.$(UPSUFFIX)
+  $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java: \
+      $(JDK_TOPDIR)/src/solaris/classes/java/lang/UNIXProcess.java.$(UPSUFFIX)
 	$(ECHO) $(LOG_INFO) Copying UNIXProcess.java.$(OPENJDK_TARGET_OS) to java/lang/UNIXProcess.java
 	$(call install-file)
 	$(CHMOD) u+rw $@
 
-    GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java
+  GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java
 endif
 
 ##########################################################################################
@@ -88,100 +88,100 @@
 GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry
 
 SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
-	$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') 
+    $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
 
-$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE,\
-		SRC:=$(GENSRC_SOR_SRC),\
-		INCLUDE_FILES:=$(GENSRC_SOR_SRC_FILE),\
-		LANG:=C,\
-		CC:=$(BUILD_CC),\
-		LDEXE:=$(BUILD_LD),\
-		OBJECT_DIR:=$(GENSRC_SOR_BIN),\
-		OUTPUT_DIR:=$(GENSRC_SOR_BIN),\
-                PROGRAM:=genSocketOptionRegistry))
+$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \
+    SRC := $(GENSRC_SOR_SRC), \
+    INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
+    LANG := C, \
+    CC := $(BUILD_CC), \
+    LDEXE := $(BUILD_LD), \
+    OBJECT_DIR := $(GENSRC_SOR_BIN), \
+    OUTPUT_DIR := $(GENSRC_SOR_BIN), \
+    PROGRAM := genSocketOptionRegistry))
 
-ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java),)
-  HAS_SOCKET_OPTION_REGISTRY:=true
+ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java), )
+  HAS_SOCKET_OPTION_REGISTRY := true
 endif
 
-ifneq ($(HAS_SOCKET_OPTION_REGISTRY),true)
-$(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java : $(BUILD_GENSRC_SOR_EXE)
+ifneq ($(HAS_SOCKET_OPTION_REGISTRY), true)
+  $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE)
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp
 	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
 	$(BUILD_GENSRC_SOR_EXE) >> $@.tmp
 	$(MV) $@.tmp $@
 else
-$(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
+  $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
 	$(call install-file)
 endif
 
 ##########################################################################################
 
-ifneq ($(OPENJDK_TARGET_OS),windows)
+ifneq ($(OPENJDK_TARGET_OS), windows)
 
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java
+  GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java
 
-GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
-GENSRC_UC_SRC_FILE := genUnixConstants.c
-GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc/genUnixConstants
+  GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
+  GENSRC_UC_SRC_FILE := genUnixConstants.c
+  GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc/genUnixConstants
 
-UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
-	$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') 
+  UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
+      $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
 
-$(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE,\
-		SRC:=$(GENSRC_UC_SRC),\
-		INCLUDE_FILES:=$(GENSRC_UC_SRC_FILE),\
-		LANG:=C,\
-		CC:=$(BUILD_CC),\
-		LDEXE:=$(BUILD_CC),\
-		CFLAGS:=$(filter -D%,$(CFLAGS_JDKEXE)),\
-		OBJECT_DIR:=$(GENSRC_UC_BIN),\
-                OUTPUT_DIR:=$(GENSRC_UC_BIN),\
-		PROGRAM:=genUnixConstants))
+  $(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE, \
+      SRC := $(GENSRC_UC_SRC), \
+      INCLUDE_FILES := $(GENSRC_UC_SRC_FILE), \
+      LANG := C, \
+      CC := $(BUILD_CC), \
+      LDEXE := $(BUILD_CC), \
+      CFLAGS := $(filter -D%, $(CFLAGS_JDKEXE)), \
+      OBJECT_DIR := $(GENSRC_UC_BIN), \
+      OUTPUT_DIR := $(GENSRC_UC_BIN), \
+      PROGRAM := genUnixConstants))
 
-ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java),)
-  HAS_UNIX_CONSTANTS:=true
-endif
+  ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java), )
+    HAS_UNIX_CONSTANTS := true
+  endif
 
-ifneq ($(HAS_UNIX_CONSTANTS),true)
-$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java : $(BUILD_GENSRC_UC_EXE)
+  ifneq ($(HAS_UNIX_CONSTANTS), true)
+    $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE)
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp
 	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
 	$(BUILD_GENSRC_UC_EXE) >> $@.tmp
 	$(MV) $@.tmp $@
-else
-$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
+  else
+    $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
 	$(call install-file)
-endif
+  endif
 
 endif
 
 ##########################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS),solaris)
+ifeq ($(OPENJDK_TARGET_OS), solaris)
 
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java
+  GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java
 
-GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
-GENSRC_SOL_SRC_FILE := genSolarisConstants.c
-GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc/genSolarisConstants
+  GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
+  GENSRC_SOL_SRC_FILE := genSolarisConstants.c
+  GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc/genSolarisConstants
 
-SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
-	$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') 
+  SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
+      $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
 
-$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE,\
-		SRC:=$(GENSRC_SOL_SRC),\
-		INCLUDE_FILES:=$(GENSRC_SOL_SRC_FILE),\
-		LANG:=C,\
-		CC:=$(BUILD_CC),\
-		LDEXE:=$(BUILD_CC),\
-		OBJECT_DIR:=$(GENSRC_SOL_BIN),\
-		OUTPUT_DIR:=$(GENSRC_SOL_BIN),\
-		PROGRAM:=genSolarisConstants))
+  $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE, \
+      SRC := $(GENSRC_SOL_SRC), \
+      INCLUDE_FILES := $(GENSRC_SOL_SRC_FILE), \
+      LANG := C, \
+      CC := $(BUILD_CC), \
+      LDEXE := $(BUILD_CC), \
+      OBJECT_DIR := $(GENSRC_SOL_BIN), \
+      OUTPUT_DIR := $(GENSRC_SOL_BIN), \
+      PROGRAM := genSolarisConstants))
 
-$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java : $(BUILD_GENSRC_SOL_EXE)
+  $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE)
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp
 	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
@@ -194,48 +194,47 @@
 ##########################################################################################
 
 ifndef OPENJDK
-ifeq ($(OPENJDK_TARGET_OS), windows)
+  ifeq ($(OPENJDK_TARGET_OS), windows)
 
     AB_GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc_ab
     AB_SRC_DIR := $(JDK_TOPDIR)/src/closed/windows/classes/com/sun/java/accessibility
 
     ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
-         $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
-			$(AB_SRC_DIR)/32bit/AccessBridgeLoader.java
+      $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
+          $(AB_SRC_DIR)/32bit/AccessBridgeLoader.java
 		$(install-file)
 
-         $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java: \
-			$(AB_SRC_DIR)/AccessBridge.java
+      $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java: \
+          $(AB_SRC_DIR)/AccessBridge.java
 		$(install-file)
 
-         $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java: \
-			$(AB_SRC_DIR)/legacy/AccessBridgeLoader.java
+      $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java: \
+          $(AB_SRC_DIR)/legacy/AccessBridgeLoader.java
 		$(install-file)
 
-         $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java: \
-			$(AB_SRC_DIR)/AccessBridge.java
+      $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java: \
+          $(AB_SRC_DIR)/AccessBridge.java
 		$(install-file)
 
-        GENSRC_MISC += $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java \
-		       $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java \
-			   $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java \
-			   $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java
+      GENSRC_MISC += $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java \
+          $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java \
+          $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java \
+          $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java
 
     else
-         $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
-			$(AB_SRC_DIR)/64bit/AccessBridgeLoader.java
+      $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
+          $(AB_SRC_DIR)/64bit/AccessBridgeLoader.java
 		$(install-file)
 
-         $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \
-			$(AB_SRC_DIR)/AccessBridge.java
+      $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \
+          $(AB_SRC_DIR)/AccessBridge.java
 		$(install-file)
 
-         GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java \
-			$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java
+      GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java \
+          $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java
 
     endif
-
-endif
+  endif
 endif
 
 ##########################################################################################
jdk-sandbox