changeset 6790:1d0dbb25b964

Merge with ssh://jfxsrc.us.oracle.com//javafx/8u/dev/jfx/rt
author kcr
date Fri, 11 Apr 2014 06:41:11 -0700
parents 2327ab524d99 2ff0b028e379
children 3438cbe3ac87
files modules/fxml/src/test/java/javafx/fxml/rt_36633.fxml
diffstat 5 files changed, 49 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/modules/fxml/src/test/java/javafx/fxml/rt_36633.fxml	Thu Apr 10 18:18:50 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<VBox prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
-    <children>
-        <TableView prefHeight="200.0" prefWidth="200.0">
-            <columns>
-                <TableColumn fx:id="rt36633_tableColumn" prefWidth="599.0" text="tableColumn1" />
-            </columns>
-        </TableView>
-
-        <TabPane>
-            <tabs>
-                <Tab fx:id="rt36633_tab" text="tab1" />
-            </tabs>
-        </TabPane>
-
-        <MenuBar>
-            <menus>
-                <Menu fx:id="rt36633_menu" text="File">
-                    <items>
-                        <MenuItem fx:id="rt36633_menuItem" text="Close" />
-                    </items>
-                </Menu>
-            </menus>
-        </MenuBar>
-    </children>
-</VBox>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/fxml/src/test/resources/javafx/fxml/rt_36633.fxml	Fri Apr 11 06:41:11 2014 -0700
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<VBox prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <TableView prefHeight="200.0" prefWidth="200.0">
+            <columns>
+                <TableColumn fx:id="rt36633_tableColumn" prefWidth="599.0" text="tableColumn1" />
+            </columns>
+        </TableView>
+
+        <TabPane>
+            <tabs>
+                <Tab fx:id="rt36633_tab" text="tab1" />
+            </tabs>
+        </TabPane>
+
+        <MenuBar>
+            <menus>
+                <Menu fx:id="rt36633_menu" text="File">
+                    <items>
+                        <MenuItem fx:id="rt36633_menuItem" text="Close" />
+                    </items>
+                </Menu>
+            </menus>
+        </MenuBar>
+    </children>
+</VBox>
\ No newline at end of file
--- a/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java	Thu Apr 10 18:18:50 2014 -0700
+++ b/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java	Fri Apr 11 06:41:11 2014 -0700
@@ -500,8 +500,6 @@
 
             if (javaRuntimeWasSet) {
                 bundleParams.setRuntime(javaRuntimeToUse);
-            } else {
-                bundleParams.setDefaultRuntime();
             }
             bundleParams.setApplicationClass(applicationClass);
             bundleParams.setName(this.appName);
--- a/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/BundleParams.java	Thu Apr 10 18:18:50 2014 -0700
+++ b/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/BundleParams.java	Fri Apr 11 06:41:11 2014 -0700
@@ -399,11 +399,6 @@
         doSetRuntime(baseDir);
     }
 
-    public void setDefaultRuntime() {
-        File f = new File(System.getProperty("java.home"));
-        doSetRuntime(f);
-    }
-
     //input dir "jdk/jre" (i.e. jre folder in the jdk)
     private void doSetRuntime(File baseDir) {
         params.put(PARAM_RUNTIME, baseDir.toString());
--- a/modules/fxpackager/src/test/java/com/sun/javafx/tools/packager/CLITest.java	Thu Apr 10 18:18:50 2014 -0700
+++ b/modules/fxpackager/src/test/java/com/sun/javafx/tools/packager/CLITest.java	Fri Apr 11 06:41:11 2014 -0700
@@ -38,10 +38,6 @@
 
     @BeforeClass
     public static void prepareApp() {
-        // on mac, require a full test
-        Assume.assumeTrue(!System.getProperty("os.name").toLowerCase().contains("os x") || Boolean.parseBoolean(System.getProperty("FULL_TEST")));
-
-
         Log.setLogger(new Log.Logger(true));
 
         String tmpBasePath = System.getProperty("tmpBase");
@@ -59,6 +55,9 @@
 
     @Test
     public void simpleTest() throws Exception {
+        // on mac, require a full test
+        Assume.assumeTrue(!System.getProperty("os.name").toLowerCase().contains("os x") || Boolean.parseBoolean(System.getProperty("FULL_TEST")));
+
         com.sun.javafx.tools.packager.Main.main("-deploy",
                 "-verbose", // verbose is required or test will call System.exit() on failures and break the build
                 "-srcfiles", fakeMainJar.getCanonicalPath(),
@@ -69,6 +68,19 @@
                 "-name", "SimpleTest");
     }
 
+    @Test
+    public void addRuntimeBundleParam() throws Exception {
+        com.sun.javafx.tools.packager.Main.main("-deploy",
+                "-verbose", // verbose is required or test will call System.exit() on failures and break the build
+                "-srcfiles", fakeMainJar.getCanonicalPath(),
+                "-outdir", workDir.getCanonicalPath(),
+                "-outfile", "SimpleTest",
+                "-appclass", "hello.TestPackager",
+                "-native", "image",
+                "-name", "SimpleTest",
+                "-Bruntime=" + System.getProperty("java.home"));
+    }
+
     @Test(expected = PackagerException.class)
     public void duplicateNameClash() throws Exception {
         com.sun.javafx.tools.packager.Main.main("-deploy",
@@ -77,7 +89,7 @@
                 "-outdir", workDir.getCanonicalPath(),
                 "-outfile", "SimpleTest",
                 "-appclass", "hello.TestPackager",
-                "-native",
+                "-native", "image",
                 "-name", "SimpleTest",
                 "-Bname=DuplicateTest");
     }
@@ -90,7 +102,7 @@
                 "-outdir", workDir.getCanonicalPath(),
                 "-outfile", "SimpleTest",
                 "-appclass", "hello.TestPackager",
-                "-native",
+                "-native", "image",
                 "-name", "SimpleTest",
                 "-Bname=SimpleTest");
     }