Skip to content
Snippets Groups Projects
Commit 85819d53 authored by Lana Steuck's avatar Lana Steuck
Browse files

Merge

parents b17398aa da88be40
No related branches found
No related tags found
No related merge requests found
......@@ -46,6 +46,10 @@ ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
endif
ifeq ($(SKIP_BOOT_CYCLE), false)
jprt_bundle: bootcycle-images
endif
# This target must be called in the context of a SPEC file
jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
@$(call CheckIfMakeAtEnd)
......
......@@ -249,7 +249,7 @@ my.test.targets.hotspot.solaris.sparcv9= \
solaris_sparcv9_5.11-{product|fastdebug}-c2-jvm98, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-jvm98_nontiered, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-scimark, \
solaris_sparcv9_5.11-product-c2-runThese, \
solaris_sparcv9_5.11-product-c2-runThese8, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParNewGC, \
......@@ -273,8 +273,9 @@ my.test.targets.hotspot.solaris.x64= \
solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \
solaris_x64_5.11-{product|fastdebug}-c2-jvm98_nontiered, \
solaris_x64_5.11-{product|fastdebug}-c2-scimark, \
solaris_x64_5.11-product-c2-runThese, \
solaris_x64_5.11-product-c2-runThese_Xcomp, \
solaris_x64_5.11-product-c2-runThese8, \
solaris_x64_5.11-product-c2-runThese8_Xcomp_lang, \
solaris_x64_5.11-product-c2-runThese8_Xcomp_vm, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParNewGC, \
......@@ -298,9 +299,11 @@ my.test.targets.hotspot.linux.i586= \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98, \
linux_i586_2.6-{product|fastdebug}-c2-jvm98_nontiered, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-scimark, \
linux_i586_2.6-product-c1-runThese_Xcomp, \
linux_i586_2.6-fastdebug-c1-runThese_Xshare, \
linux_i586_2.6-fastdebug-c2-runThese_Xcomp, \
linux_i586_2.6-product-c1-runThese8_Xcomp_lang, \
linux_i586_2.6-product-c1-runThese8_Xcomp_vm, \
linux_i586_2.6-fastdebug-c1-runThese8_Xshare, \
linux_i586_2.6-fastdebug-c2-runThese8_Xcomp_lang, \
linux_i586_2.6-fastdebug-c2-runThese8_Xcomp_vm, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
......@@ -366,9 +369,10 @@ my.test.targets.hotspot.windows.i586= \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98, \
windows_i586_6.1-{product|fastdebug}-c2-jvm98_nontiered, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-scimark, \
windows_i586_6.1-product-{c1|c2}-runThese, \
windows_i586_6.1-product-{c1|c2}-runThese_Xcomp, \
windows_i586_6.1-fastdebug-c1-runThese_Xshare, \
windows_i586_6.1-product-{c1|c2}-runThese8, \
windows_i586_6.1-product-{c1|c2}-runThese8_Xcomp_lang, \
windows_i586_6.1-product-{c1|c2}-runThese8_Xcomp_vm, \
windows_i586_6.1-fastdebug-c1-runThese8_Xshare, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
......@@ -392,8 +396,9 @@ my.test.targets.hotspot.windows.x64= \
windows_x64_6.1-{product|fastdebug}-c2-jvm98, \
windows_x64_6.1-{product|fastdebug}-c2-jvm98_nontiered, \
windows_x64_6.1-{product|fastdebug}-c2-scimark, \
windows_x64_6.1-product-c2-runThese, \
windows_x64_6.1-product-c2-runThese_Xcomp, \
windows_x64_6.1-product-c2-runThese8, \
windows_x64_6.1-product-c2-runThese8_Xcomp_lang, \
windows_x64_6.1-product-c2-runThese8_Xcomp_vm, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_SerialGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParallelGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParNewGC, \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment