jdk/make/CompileDemos.gmk

*** 28,37 ****
--- 28,38 ----
  include $(SPEC)
  include MakeBase.gmk
  include JavaCompilation.gmk
  include NativeCompilation.gmk
  include SetupJavaCompilers.gmk
+ include TextFileProcessing.gmk
  
  # Prepare the find cache.
  $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))
  
  # Append demo goals to this variable.
*** 47,56 ****
--- 48,66 ----
  DEMO_OS_TYPE_SRC := $(JDK_TOPDIR)/src/demo/$(OPENJDK_TARGET_OS_TYPE)
  GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
  
  ##################################################################################################
  
+ # This rule will be depended on due to the MANIFEST line
+ $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \
+   SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
+   OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/demo/java-main-manifest.mf, \
+   REPLACEMENTS := \
+       @@RELEASE@@ => $(RELEASE) ; \
+       @@COMPANY_NAME@@ => $(COMPANY_NAME) , \
+ ))
+ 
  define SetupAppletDemo
    $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1, \
        SETUP := GENERATE_USINGJDKBYTECODE, \
        SRC := $(JDK_TOPDIR)/src/$3demo/share/applets/$1, \
        BIN := $(SUPPORT_OUTPUTDIR)/demo/image/applets/$1, \
*** 120,130 ****
          SRC := $$($1_MAIN_SRC) $5, \
          BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/$2/$1, \
          COPY := $(PATTERNS_TO_COPY) $(10), \
          JAR := $(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/$$($1_JARFILE), \
          JARMAIN := $4, \
!         MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
          EXTRA_MANIFEST_ATTR := $(11), \
          SRCZIP := $(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/src.zip, \
          EXCLUDE_FILES := $9, \
          DISABLE_SJAVAC := $(12)))
  
--- 130,140 ----
          SRC := $$($1_MAIN_SRC) $5, \
          BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/$2/$1, \
          COPY := $(PATTERNS_TO_COPY) $(10), \
          JAR := $(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/$$($1_JARFILE), \
          JARMAIN := $4, \
!         MANIFEST := $(SUPPORT_OUTPUTDIR)/demo/java-main-manifest.mf, \
          EXTRA_MANIFEST_ATTR := $(11), \
          SRCZIP := $(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/src.zip, \
          EXCLUDE_FILES := $9, \
          DISABLE_SJAVAC := $(12)))
  
*** 288,298 ****
          SRC := $(DEMO_SHARE_SRC)/jvmti/$1, \
          BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/jvmti/$1, \
          COPY := $(PATTERNS_TO_COPY), \
          JAR := $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/$1.jar, \
          EXTRA_MANIFEST_ATTR := Main-Class: \n, \
!         MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf))
  
      BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/$1.jar
    endif
  
    BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \
--- 298,308 ----
          SRC := $(DEMO_SHARE_SRC)/jvmti/$1, \
          BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/jvmti/$1, \
          COPY := $(PATTERNS_TO_COPY), \
          JAR := $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/$1.jar, \
          EXTRA_MANIFEST_ATTR := Main-Class: \n, \
!         MANIFEST := $(SUPPORT_OUTPUTDIR)/demo/java-main-manifest.mf))
  
      BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/$1.jar
    endif
  
    BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \
*** 380,390 ****
        SETUP := GENERATE_USINGJDKBYTECODE, \
        SRC := $(DEMO_SOLARIS_SRC)/jni/Poller, \
        BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller, \
        HEADERS := $(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller, \
        JAR := $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/Poller.jar, \
!       MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
        SRCZIP := $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/src.zip, \
        COPY := README.txt Poller.c, \
        JARMAIN := Client))
  
  
--- 390,400 ----
        SETUP := GENERATE_USINGJDKBYTECODE, \
        SRC := $(DEMO_SOLARIS_SRC)/jni/Poller, \
        BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller, \
        HEADERS := $(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller, \
        JAR := $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/Poller.jar, \
!       MANIFEST := $(SUPPORT_OUTPUTDIR)/demo/java-main-manifest.mf, \
        SRCZIP := $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/src.zip, \
        COPY := README.txt Poller.c, \
        JARMAIN := Client))