Merge from (root)

.classpath

@@ -2,7 +2,6 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="src" exported="true" path="/web"/>
   <classpathentry kind="src" exported="true" path="/fxml"/>
-  <classpathentry kind="src" exported="true" path="/fxpackager"/>
   <classpathentry kind="src" exported="true" path="/swt"/>
   <classpathentry kind="src" exported="true" path="/swing"/>
   <classpathentry kind="src" exported="true" path="/media"/>

buildSrc/android.gradle

@@ -98,7 +98,6 @@ def armArchs = ["armeabi", "armeabiv-7a"]
 ANDROID = [:]
 ANDROID.compileSwing = false;
 ANDROID.compileSWT = false;
-ANDROID.compileFXPackager = false;
 ANDROID.glassPlatform = "android"
 ANDROID.armArch = armArchs[0]
 ANDROID.libDest = "lib"

buildSrc/armv6hf.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,6 @@ ARMV6HF.library = { name -> return "lib${name}.so" as String }
 
 ARMV6HF.compileSwing = false;
 ARMV6HF.compileSWT = false;
-ARMV6HF.compileFXPackager = false;
 ARMV6HF.compileWebnodeNative = false;
 ARMV6HF.compileMediaNative = false;
 

buildSrc/dalvik.gradle

@@ -100,7 +100,6 @@ def armArchs = ["armeabi", "armeabiv-7a"]
 ext.DALVIK = [:]
 DALVIK.compileSwing = false;
 DALVIK.compileSWT = false;
-DALVIK.compileFXPackager = false;
 DALVIK.compileDesignTime = false;
 DALVIK.glassPlatform = "android"
 DALVIK.armArch = armArchs[0]

buildSrc/ios.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ if (!IOS.canBuild) return;
 
 IOS.compileSwing = false;
 IOS.compileSWT = false;
-IOS.compileFXPackager = false;
 
 defineProperty("USE_LIPO", "false")
 IOS.useLipo = Boolean.parseBoolean(USE_LIPO)

buildSrc/linux.gradle

@@ -32,7 +32,6 @@ if (!LINUX.canBuild) return;
 // All desktop related packages should be built
 LINUX.compileSwing = true;
 LINUX.compileSWT = true;
-LINUX.compileFXPackager = true;
 
 // Libraries end up in the lib/$OS_ARCH directory for Linux
 LINUX.libDest = "lib"
@@ -258,26 +257,6 @@ LINUX.prismSW.linker = linker
 LINUX.prismSW.linkFlags = [linkFlags].flatten()
 LINUX.prismSW.lib = "prism_sw"
 
-LINUX.launcher = [:]
-LINUX.launcher.compiler = compiler
-LINUX.launcher.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
-LINUX.launcher.linker = linker
-LINUX.launcher.linkFlags = ["-ldl"]
-if (!IS_64) {
-    LINUX.launcher.ccFlags += "-m32"
-    LINUX.launcher.linkFlags += "-m32"
-}
-
-LINUX.launcherlibrary = [:]
-LINUX.launcherlibrary.compiler = compiler
-LINUX.launcherlibrary.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98", "-ffunction-sections", "-fdata-sections"]
-LINUX.launcherlibrary.linker = linker
-LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared", "-static-libgcc", "-static-libstdc++", "-Wl,--gc-sections"]
-if (!IS_64) {
-    LINUX.launcherlibrary.ccFlags += "-m32"
-    LINUX.launcherlibrary.linkFlags += "-m32"
-}
-
 LINUX.iio = [:]
 LINUX.iio.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),

buildSrc/mac.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@ if (!MAC.canBuild) return;
 // All desktop related packages should be built
 MAC.compileSwing = true;
 MAC.compileSWT = true;
-MAC.compileFXPackager = true;
 
 MAC.includeNull3d = true
 
@@ -168,28 +167,6 @@ MAC.prismSW.linker = linker
 MAC.prismSW.linkFlags = [MAC.prism.linkFlags].flatten()
 MAC.prismSW.lib = "prism_sw"
 
-MAC.launcher = [:]
-MAC.launcher.compiler = compiler
-MAC.launcher.ccFlags = [
-        "-std=c99",
-        ccBaseFlags,
-        "-framework", "Cocoa",
-        IS_DEBUG_NATIVE ? ["-DDEBUG", "-O0"] : ["-O3", "-DNDEBUG"]].flatten()
-MAC.launcher.linker = linker
-MAC.launcher.linkFlags = ["-ldl"]
-
-MAC.launcherlibrary = [:]
-MAC.launcherlibrary.compiler = compiler
-MAC.launcherlibrary.ccFlags = [
-        "-c",
-        ccBaseFlags,
-        IS_DEBUG_NATIVE ? ["-DDEBUG", "-O0"] : ["-O3", "-DNDEBUG"]].flatten()
-    MAC.launcherlibrary.ccFlags += "-stdlib=libstdc++"
-MAC.launcherlibrary.linker = linker
-MAC.launcherlibrary.linkFlags = ["-ldl", "-dynamiclib",
-        "-framework", "Cocoa",
-        "-stdlib=libstdc++"]
-
 MAC.iio = [:]
 MAC.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 MAC.iio.nativeSource = [

buildSrc/win.gradle

@@ -30,7 +30,6 @@ if (!WIN.canBuild) return;
 
 WIN.compileSwing = true;
 WIN.compileSWT = true;
-WIN.compileFXPackager = true;
 
 WIN.includeNull3d = true
 
@@ -104,7 +103,7 @@ if (winVsVer >= 120) {
 }
 
 
-// Common set of flags for all modules except fxpackager
+// Common set of flags for all modules
 def ccFlags = ["/nologo", "/W3", "/EHsc", "/c",
         "/D_STATIC_CPPLIB", "/D_DISABLE_DEPRECATE_STATIC_CPPLIB", "/DINLINE=__inline",
         "/DUNICODE", "/D_UNICODE", "/DWIN32", "/DIAL", "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN",
@@ -365,45 +364,6 @@ WIN.prismD3D.rcCompiler = rcCompiler;
 WIN.prismD3D.rcSource = defaultRcSource
 WIN.prismD3D.rcFlags = ["/d", "JFX_FNAME=prism_d3d.dll", "/d", "JFX_INTERNAL_NAME=prismD3D", rcFlags].flatten();
 
-WIN.launcher = [:]
-WIN.launcher.compiler = compiler
-WIN.launcher.ccFlags = ["/nologo", "/W3", "/MT", "/EHsc", "/D_WINDOWS", "/DUNICODE", "/D_UNICODE", "/DWIN32",
-        "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN", "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
-        ccDebugFlags].flatten();
-WIN.launcher.linker = linker
-WIN.launcher.linkFlags = ["/link", "/nologo", "/WX", "/SUBSYSTEM:WINDOWS", "user32.lib", "shell32.lib", "advapi32.lib"]
-if (IS_DEBUG_NATIVE) WIN.launcher.linkFlags.add("/debug");
-
-WIN.launcherlibrary = [:]
-WIN.launcherlibrary.compiler = compiler
-WIN.launcherlibrary.ccFlags = ["/nologo", "/W3",
-        // "/WX",
-        "/EHsc", "/c", "/D_WINDOWS", "/DUNICODE", "/D_UNICODE", "/DWIN32",
-        "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN", "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
-        ccDebugFlags].flatten();
-WIN.launcherlibrary.linker = linker
-WIN.launcherlibrary.linkFlags = ["/nologo", "/WX", "/DLL", "/SUBSYSTEM:WINDOWS", "user32.lib", "shell32.lib", "advapi32.lib", "ole32.lib"]
-if (IS_DEBUG_NATIVE) WIN.launcherlibrary.linkFlags.add("/debug");
-
-WIN.fxpackager = [:]
-WIN.fxpackager.nativeSource = [
-    file("${project("fxpackager").projectDir}/src/main/native/javapackager/win")]
-WIN.fxpackager.compiler = compiler
-WIN.fxpackager.ccFlags = ["/nologo", "/W3", "/EHsc", "/MT", "/GS",  "/DUNICODE", "/D_UNICODE",
-                    "/DWIN32", "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN",
-                    "/D_WIN32_WINDOWS=0X0500", "/D_WIN32_WINNT=0X0500",
-                    "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
-                    "/O2", "-c"]
-WIN.fxpackager.linker = linker
-WIN.fxpackager.linkFlags = ["/nologo", "/SUBSYSTEM:CONSOLE", "/opt:REF", "/incremental:no", "/manifest", "kernel32.lib", "advapi32.lib"];
-WIN.fxpackager.rcSource = file("${project("fxpackager").projectDir}/src/main/native/javapackager/win/javapackager.rc")
-WIN.fxpackager.rcCompiler = rcCompiler
-WIN.fxpackager.rcFlags = [
-    "/l", "0x409",
-    "/d", "JFX_FNAME=javapackager.exe",
-    "/d", "JFX_INTERNAL_NAME=javapackager",
-    rcFlags].flatten();
-
 WIN.iio = [:]
 WIN.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 WIN.iio.nativeSource = [