Changeset 367

Timestamp:

May 20, 2012, 4:06:18 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Better way to store platform-specific Java class implementations.

Location:

trunk/icedtea-web/plugin/icedteanp

Files:

• Makefile.kmk (modified) (4 diffs)
• os2 (added)
• os2/java (added)
• os2/java/sun (added)
• os2/java/sun/applet (added)
• os2/java/sun/applet/PluginAppletViewerBase.java (moved) (moved from trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewerBase_OS2.java )
• x11 (added)
• x11/java (added)
• x11/java/sun (added)
• x11/java/sun/applet (added)
• x11/java/sun/applet/PluginAppletViewerBase.java (moved) (moved from trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewerBase_X11.java )

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

@@ -63 +63 @@
 BLDDIRS += $(liveconnect_0_OUTDIR)
 
+JAVASRCDIRS = $(PATH_SUB_CURRENT)/java
+ifeq ($(KBUILD_TARGET),os2)
+JAVASRCDIRS += $(PATH_SUB_CURRENT)/os2/java
+else # assume Linux
+JAVASRCDIRS += $(PATH_SUB_CURRENT)/x11/java
+endif
+
 JAVASRCLIST += $(liveconnect_0_OUTDIR)/javasrc.list
 BLDDIRS += $(dir $(JAVASRCLIST))
-OTHER_CLEAN += $(JAVASRCLIST) $(JAVASRCLIST).stamp \
-               $(JAVASRCLIST).os2 $(JAVASRCLIST).os2.stamp
+OTHER_CLEAN += $(JAVASRCLIST) $(JAVASRCLIST).stamp
 
 JARFILE = $(PATH_STAGE)/lib/plugin.jar
@@ -72 +78 @@
 OTHER_CLEAN += $(JARFILE)
 
-$$(JAVASRCLIST).os2: $(MAKEFILE) | $$(call DIRDEP,$$(dir $$(@)))
-        @echo 'JAVASRC.os2 = \' > $@
-        find $(PATH_SUB_CURRENT)/java -name '*.java' \
-        -name '*_OS2*' \
+$$(JAVASRCLIST): $(MAKEFILE) | $$(call DIRDEP,$$(dir $$(@)))
+        @echo 'JAVASRC = \' > $@
+        find $(JAVASRCDIRS) -name '*.java' \
         -printf '%p \\\n' >> $@
 
-$$(JAVASRCLIST).os2.stamp: $$(JAVASRC.os2) | $$(call DIRDEP,$$(dir $$(@)))
-        $(call MSG_COMPILE,liveconnect.os2,$(words $?) sources,$@,JAVA)
-        @echo $? > $(JAVASRCLIST).os2.rsp
-        $(PATH_BOOTSTRAP_JDK)/bin/javac $(IT_JAVACFLAGS) \
-        -d "$(liveconnect_0_OUTDIR)" \
-        -sourcepath "$(PATH_SUB_CURRENT)/java" \
-        -bootclasspath "$(BOOTSTRAP_JDK_RUNTIME);$(PATH_STAGE)/lib/netx.jar" \
-        @"$(JAVASRCLIST).os2.rsp"
-        @$(RM) "$(JAVASRCLIST).os2.rsp"
-        @touch "$@"
-
-$$(JAVASRCLIST): $(MAKEFILE) | $$(call DIRDEP,$$(dir $$(@)))
-        @echo 'JAVASRC = \' > $@
-        find $(PATH_SUB_CURRENT)/java -name '*.java' \
-        ! -name '*_X11*' ! -name '*_OS2*' \
-        -printf '%p \\\n' >> $@
-
-$$(JAVASRCLIST).stamp: $$(JAVASRC) | $$(JAVASRCLIST).os2.stamp $$(call DIRDEP,$$(dir $$(@)))
+$$(JAVASRCLIST).stamp: $$(JAVASRC) | $$(call DIRDEP,$$(dir $$(@)))
         $(call MSG_COMPILE,liveconnect,$(words $?) sources,$@,JAVA)
         @echo $? > $(JAVASRCLIST).rsp
@@ -101 +89 @@
         -d "$(liveconnect_0_OUTDIR)" \
         -classpath "$(liveconnect_0_OUTDIR)" \
-        -sourcepath "$(PATH_SUB_CURRENT)/java" \
+        -sourcepath "$(subst ; ,;,$(foreach d,$(JAVASRCDIRS),$(d);))" \
         -bootclasspath "$(BOOTSTRAP_JDK_RUNTIME);$(PATH_STAGE)/lib/netx.jar" \
         @"$(JAVASRCLIST).rsp"
@@ -116 +104 @@
 include $(FILE_KBUILD_SUB_FOOTER)
 
--include $(JAVASRCLIST).os2
 -include $(JAVASRCLIST)