Changeset 360

Timestamp:

May 9, 2012, 11:52:50 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Add proper build steps for .java and .jar files.

Location:

trunk/icedtea-web

Files:

• netx/Makefile.kmk (modified) (2 diffs)
• plugin/icedteanp/Makefile.kmk (modified) (1 diff)

trunk/icedtea-web/netx/Makefile.kmk ¶

@@ -10 +10 @@
 BUILD_PROPERTIES = $(netx_0_OUTDIR)/net/sourceforge/jnlp/build.properties
 BLDDIRS += $(dir $(BUILD_PROPERTIES))
+OTHER_CLEAN += $(BUILD_PROPERTIES)
 
-OTHER_CLEAN += $(BUILD_PROPERTIES) $(netx_0_OUTDIR)/files.txt
+MANIFEST = $(netx_0_OUTDIR)/netx.manifest
+BLDDIRS += $(dir $(MANIFEST))
+OTHER_CLEAN += $(MANIFEST)
+
+JAVASRCLIST += $(netx_0_OUTDIR)/javasrc.list
+BLDDIRS += $(dir $(JAVASRCLIST))
+OTHER_CLEAN += $(JAVASRCLIST) $(JAVASRCLIST).rsp $(JAVASRCLIST).stamp
+
+JARFILE = $(PATH_STAGE)/lib/netx.jar
+BLDDIRS += $(dir $(JARFILE))
+OTHER_CLEAN += $(JARFILE)
 
 $$(BUILD_PROPERTIES): $(PATH_ROOT)/build.properties.in | $$(call DIRDEP,$$(dir $$(@)))
         sed "s/@RHINO_AVAILABLE@/$(if $(WITH_RHINO),true,false)/g" < $^ > $@
 
-netx: $$(BUILD_PROPERTIES) | $$(call DIRDEP,$$(netx_0_OUTDIR))
-        find $(PATH_SUB_CURRENT) -name '*.java' | sort > $(netx_0_OUTDIR)/files.txt
-ifndef WITH_RHINO
-        sed -i '/RhinoBasedPacEvaluator/ d' $(netx_0_OUTDIR)/files.txt
-endif
+$$(MANIFEST): $(PATH_ROOT)/netx.manifest.in | $$(call DIRDEP,$$(dir $$(@)))
+        sed "s/@PACKAGE_NAME@/$(PACKAGE_NAME)/g; \
+         s/@FULL_VERSION@/$(FULL_VERSION)/g; " < $^ > $@
+
+$$(JAVASRCLIST): $(MAKEFILE) | $$(call DIRDEP,$$(dir $$(@)))
+        @echo 'JAVASRC = \' > $@
+        find $(PATH_SUB_CURRENT) -name '*.java' \
+        $(if $(WITH_RHINO),,! -name '*RhinoBasedPacEvaluator*') \
+        -printf '%p \\\n' >> $@
+
+$$(JAVASRCLIST).stamp: $$(JAVASRC) | $$(call DIRDEP,$$(dir $$(@)))
+        $(call MSG_COMPILE,netx,$(words $?) sources,$@,JAVA)
+        @echo $? > $(JAVASRCLIST).rsp
         $(PATH_BOOTSTRAP_JDK)/bin/javac $(IT_JAVACFLAGS) \
         -d "$(netx_0_OUTDIR)" \
         -sourcepath "$(PATH_SUB_CURRENT)" \
         -bootclasspath "$(BOOTSTRAP_JDK_RUNTIME)" \
-        @$(netx_0_OUTDIR)/files.txt
+        @"$(JAVASRCLIST).rsp"
+        @touch "$@"
+
+$$(JARFILE): $$(BUILD_PROPERTIES) $$(MANIFEST) $$(JAVASRCLIST).stamp
         (cd $(PATH_SUB_CURRENT)/net/sourceforge/jnlp/resources; \
         for files in $$(find . -path ./.svn -prune -o -type f -print); \
@@ -34 +56 @@
         cp -a $(PATH_SUB_CURRENT)/net/sourceforge/jnlp/runtime/pac-funcs.js \
         $(netx_0_OUTDIR)/net/sourceforge/jnlp/runtime
+        (cd $(netx_0_OUTDIR); \
+        $(PATH_BOOTSTRAP_JDK)/bin/jar cfm $(JARFILE) \
+            $(MANIFEST) javax/jnlp net)
 
+netx: $$(JARFILE) | $$(call DIRDEP,$$(netx_0_OUTDIR))
 
 include $(FILE_KBUILD_SUB_FOOTER)
 
-#$(error --$(PATH_OUT))
+-include $(JAVASRCLIST)

trunk/icedtea-web/plugin/icedteanp/Makefile.kmk ¶

@@ -31 +31 @@
     $(PATH_ROOT)/extra/OS.cc
 
-# Unsorted stuff from Makefile.in
+OTHERS += liveconnect
+BLDDIRS += $(liveconnect_0_OUTDIR)
 
-#@ENABLE_PLUGIN_TRUE@ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
-#@ENABLE_PLUGIN_TRUE@LIVECONNECT_DIR = netscape sun/applet
-#@ENABLE_PLUGIN_TRUE@PLUGIN_DIR = $(abs_top_builddir)/plugin/icedteanp
-#@ENABLE_PLUGIN_TRUE@PLUGIN_SRCDIR = $(abs_top_srcdir)/plugin/icedteanp
-#@ENABLE_PLUGIN_TRUE@LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
-#@ENABLE_PLUGIN_TRUE@ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/IcedTeaPlugin.so stamps/liveconnect-dist.stamp
-#@ENABLE_PLUGIN_TRUE@PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
+JAVASRCLIST += $(liveconnect_0_OUTDIR)/javasrc.list
+BLDDIRS += $(dir $(JAVASRCLIST))
+OTHER_CLEAN += $(JAVASRCLIST) $(JAVASRCLIST).rsp $(JAVASRCLIST).stamp
 
-#@ENABLE_PLUGIN_TRUE@   ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(libdir)
-#@ENABLE_PLUGIN_TRUE@   ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
+JARFILE = $(PATH_STAGE)/lib/plugin.jar
+BLDDIRS += $(dir $(JARFILE))
+OTHER_CLEAN += $(JARFILE)
 
-#@ENABLE_PLUGIN_TRUE@stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) stamps/plugin.stamp
-#@ENABLE_PLUGIN_TRUE@   mkdir -p plugin/tests/LiveConnect
-#@ENABLE_PLUGIN_TRUE@   $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-#@ENABLE_PLUGIN_TRUE@    -d plugin/tests/LiveConnect \
-#@ENABLE_PLUGIN_TRUE@    -classpath liveconnect/lib/classes.jar \
-#@ENABLE_PLUGIN_TRUE@    $(PLUGIN_TEST_SRCS) ;
-#@ENABLE_PLUGIN_TRUE@   $(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
-#@ENABLE_PLUGIN_TRUE@     plugin/tests/LiveConnect/*.class ;
-#@ENABLE_PLUGIN_TRUE@   cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
-#@ENABLE_PLUGIN_TRUE@     plugin/tests/LiveConnect ;
-#@ENABLE_PLUGIN_TRUE@   echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
-#@ENABLE_PLUGIN_TRUE@   mkdir -p stamps
-#@ENABLE_PLUGIN_TRUE@   touch stamps/plugin-tests.stamp
+$$(JAVASRCLIST): $(MAKEFILE) | $$(call DIRDEP,$$(dir $$(@)))
+        @echo 'JAVASRC = \' > $@
+        find $(PATH_SUB_CURRENT) -name '*.java' \
+        -printf '%p \\\n' >> $@
+
+$$(JAVASRCLIST).stamp: $$(JAVASRC) | $$(call DIRDEP,$$(dir $$(@)))
+        $(call MSG_COMPILE,liveconnect,$(words $?) sources,$@,JAVA)
+        @echo $? > $(JAVASRCLIST).rsp
+        $(PATH_BOOTSTRAP_JDK)/bin/javac $(IT_JAVACFLAGS) \
+        -d "$(liveconnect_0_OUTDIR)" \
+        -sourcepath "$(PATH_SUB_CURRENT)/icedteanp/java" \
+        -bootclasspath "$(BOOTSTRAP_JDK_RUNTIME);$(PATH_STAGE)/lib/netx.jar" \
+        @"$(JAVASRCLIST).rsp"
+        @touch "$@"
+
+$$(JARFILE): $$(JAVASRCLIST).stamp
+        (cd $(liveconnect_0_OUTDIR); \
+        $(PATH_BOOTSTRAP_JDK)/bin/jar cf $(JARFILE) \
+            netscape sun/applet)
+
+liveconnect: $$(JARFILE) | $$(call DIRDEP,$$(liveconnect_0_OUTDIR))
 
 include $(FILE_KBUILD_SUB_FOOTER)
+
+-include $(JAVASRCLIST)