105 $1_JARFILE := $8.jar |
105 $1_JARFILE := $8.jar |
106 else |
106 else |
107 $1_JARFILE := $1.jar |
107 $1_JARFILE := $1.jar |
108 endif |
108 endif |
109 |
109 |
110 # Compile java classes if there are any. |
110 ifeq ($(findstring $1,Laffy SwingSet3),) |
111 $1_JAVA_FILES_EXIST := $$(shell $$(FIND) $$($1_MAIN_SRC) -name "*.java") |
|
112 |
|
113 ifneq ($$($1_JAVA_FILES_EXIST),) |
|
114 $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1,\ |
111 $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1,\ |
115 SETUP:=GENERATE_USINGJDKBYTECODE,\ |
112 SETUP:=GENERATE_USINGJDKBYTECODE,\ |
116 ADD_JAVAC_FLAGS:=$3,\ |
113 ADD_JAVAC_FLAGS:=$3,\ |
117 SRC:=$$($1_MAIN_SRC) $5,\ |
114 SRC:=$$($1_MAIN_SRC) $5,\ |
118 BIN:=$(JDK_OUTPUTDIR)/democlasses/$2/$1,\ |
115 BIN:=$(JDK_OUTPUTDIR)/democlasses/$2/$1,\ |
262 LDFLAGS_SUFFIX_windows:=$6,\ |
259 LDFLAGS_SUFFIX_windows:=$6,\ |
263 LDFLAGS_SUFFIX_solaris:=$7 -lc,\ |
260 LDFLAGS_SUFFIX_solaris:=$7 -lc,\ |
264 LDFLAGS_SUFFIX_linux:=$8,\ |
261 LDFLAGS_SUFFIX_linux:=$8,\ |
265 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
262 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
266 RC_FLAGS:=$$(RC_FLAGS) \ |
263 RC_FLAGS:=$$(RC_FLAGS) \ |
267 /D "JDK_FNAME=$1.dll" \ |
264 -D "JDK_FNAME=$1.dll" \ |
268 /D "JDK_INTERNAL_NAME=$1" \ |
265 -D "JDK_INTERNAL_NAME=$1" \ |
269 /D "JDK_FTYPE=0x2L",\ |
266 -D "JDK_FTYPE=0x2L",\ |
270 OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jvmti/$1,\ |
267 OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jvmti/$1,\ |
271 OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib,\ |
268 OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib,\ |
272 LIBRARY:=$1)) |
269 LIBRARY:=$1)) |
273 |
270 |
274 $$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1,\ |
271 $$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1,\ |
454 DB_DEMO_ZIPFILE := $(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/db -name "*demo*.zip") |
451 DB_DEMO_ZIPFILE := $(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/db -name "*demo*.zip") |
455 |
452 |
456 $(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE) |
453 $(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE) |
457 $(MKDIR) -p $(@D) |
454 $(MKDIR) -p $(@D) |
458 $(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo |
455 $(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo |
459 $(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -o $< |
456 $(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -q -o $< |
460 $(MV) $(JDK_OUTPUTDIR)/demo/demo $(JDK_OUTPUTDIR)/demo/db |
457 $(MV) $(JDK_OUTPUTDIR)/demo/demo $(JDK_OUTPUTDIR)/demo/db |
461 $(TOUCH) $@ |
458 $(TOUCH) $@ |
462 |
459 |
463 # Copy this after the unzip above to avoid race with directory creation and mv command. |
460 # Copy this after the unzip above to avoid race with directory creation and mv command. |
464 $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \ |
461 $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \ |