Skip to content

Commit b31dc0f

Browse files
author
kcr
committed
8203379: Remove javapackager sources from OpenJFX repo
Reviewed-by: mbilla, prr, nlisker
1 parent 094c292 commit b31dc0f

File tree

530 files changed

+14
-86879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

530 files changed

+14
-86879
lines changed

‎.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
33
<classpathentry kind="src" exported="true" path="/web"/>
44
<classpathentry kind="src" exported="true" path="/fxml"/>
5-
<classpathentry kind="src" exported="true" path="/fxpackager"/>
65
<classpathentry kind="src" exported="true" path="/swt"/>
76
<classpathentry kind="src" exported="true" path="/swing"/>
87
<classpathentry kind="src" exported="true" path="/media"/>

‎.idea/fxpackager.iml

-17
This file was deleted.

‎.idea/modules.xml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/rt.iml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle

+2-662
Large diffs are not rendered by default.

‎buildSrc/android.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ def armArchs = ["armeabi", "armeabiv-7a"]
9898
ANDROID = [:]
9999
ANDROID.compileSwing = false;
100100
ANDROID.compileSWT = false;
101-
ANDROID.compileFXPackager = false;
102101
ANDROID.glassPlatform = "android"
103102
ANDROID.armArch = armArchs[0]
104103
ANDROID.libDest = "lib"

‎buildSrc/armv6hf.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* 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 }
7777

7878
ARMV6HF.compileSwing = false;
7979
ARMV6HF.compileSWT = false;
80-
ARMV6HF.compileFXPackager = false;
8180
ARMV6HF.compileWebnodeNative = false;
8281
ARMV6HF.compileMediaNative = false;
8382

‎buildSrc/dalvik.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ def armArchs = ["armeabi", "armeabiv-7a"]
100100
ext.DALVIK = [:]
101101
DALVIK.compileSwing = false;
102102
DALVIK.compileSWT = false;
103-
DALVIK.compileFXPackager = false;
104103
DALVIK.compileDesignTime = false;
105104
DALVIK.glassPlatform = "android"
106105
DALVIK.armArch = armArchs[0]

‎buildSrc/ios.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ if (!IOS.canBuild) return;
3737

3838
IOS.compileSwing = false;
3939
IOS.compileSWT = false;
40-
IOS.compileFXPackager = false;
4140

4241
defineProperty("USE_LIPO", "false")
4342
IOS.useLipo = Boolean.parseBoolean(USE_LIPO)

‎buildSrc/linux.gradle

-21
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ if (!LINUX.canBuild) return;
3232
// All desktop related packages should be built
3333
LINUX.compileSwing = true;
3434
LINUX.compileSWT = true;
35-
LINUX.compileFXPackager = true;
3635

3736
// Libraries end up in the lib/$OS_ARCH directory for Linux
3837
LINUX.libDest = "lib"
@@ -258,26 +257,6 @@ LINUX.prismSW.linker = linker
258257
LINUX.prismSW.linkFlags = [linkFlags].flatten()
259258
LINUX.prismSW.lib = "prism_sw"
260259

261-
LINUX.launcher = [:]
262-
LINUX.launcher.compiler = compiler
263-
LINUX.launcher.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
264-
LINUX.launcher.linker = linker
265-
LINUX.launcher.linkFlags = ["-ldl"]
266-
if (!IS_64) {
267-
LINUX.launcher.ccFlags += "-m32"
268-
LINUX.launcher.linkFlags += "-m32"
269-
}
270-
271-
LINUX.launcherlibrary = [:]
272-
LINUX.launcherlibrary.compiler = compiler
273-
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"]
274-
LINUX.launcherlibrary.linker = linker
275-
LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared", "-static-libgcc", "-static-libstdc++", "-Wl,--gc-sections"]
276-
if (!IS_64) {
277-
LINUX.launcherlibrary.ccFlags += "-m32"
278-
LINUX.launcherlibrary.linkFlags += "-m32"
279-
}
280-
281260
LINUX.iio = [:]
282261
LINUX.iio.nativeSource = [
283262
file("${project("graphics").projectDir}/src/main/native-iio"),

‎buildSrc/mac.gradle

+1-24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@ if (!MAC.canBuild) return;
3131
// All desktop related packages should be built
3232
MAC.compileSwing = true;
3333
MAC.compileSWT = true;
34-
MAC.compileFXPackager = true;
3534

3635
MAC.includeNull3d = true
3736

@@ -168,28 +167,6 @@ MAC.prismSW.linker = linker
168167
MAC.prismSW.linkFlags = [MAC.prism.linkFlags].flatten()
169168
MAC.prismSW.lib = "prism_sw"
170169

171-
MAC.launcher = [:]
172-
MAC.launcher.compiler = compiler
173-
MAC.launcher.ccFlags = [
174-
"-std=c99",
175-
ccBaseFlags,
176-
"-framework", "Cocoa",
177-
IS_DEBUG_NATIVE ? ["-DDEBUG", "-O0"] : ["-O3", "-DNDEBUG"]].flatten()
178-
MAC.launcher.linker = linker
179-
MAC.launcher.linkFlags = ["-ldl"]
180-
181-
MAC.launcherlibrary = [:]
182-
MAC.launcherlibrary.compiler = compiler
183-
MAC.launcherlibrary.ccFlags = [
184-
"-c",
185-
ccBaseFlags,
186-
IS_DEBUG_NATIVE ? ["-DDEBUG", "-O0"] : ["-O3", "-DNDEBUG"]].flatten()
187-
MAC.launcherlibrary.ccFlags += "-stdlib=libstdc++"
188-
MAC.launcherlibrary.linker = linker
189-
MAC.launcherlibrary.linkFlags = ["-ldl", "-dynamiclib",
190-
"-framework", "Cocoa",
191-
"-stdlib=libstdc++"]
192-
193170
MAC.iio = [:]
194171
MAC.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
195172
MAC.iio.nativeSource = [

‎buildSrc/win.gradle

+1-41
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ if (!WIN.canBuild) return;
3030

3131
WIN.compileSwing = true;
3232
WIN.compileSWT = true;
33-
WIN.compileFXPackager = true;
3433

3534
WIN.includeNull3d = true
3635

@@ -104,7 +103,7 @@ if (winVsVer >= 120) {
104103
}
105104

106105

107-
// Common set of flags for all modules except fxpackager
106+
// Common set of flags for all modules
108107
def ccFlags = ["/nologo", "/W3", "/EHsc", "/c",
109108
"/D_STATIC_CPPLIB", "/D_DISABLE_DEPRECATE_STATIC_CPPLIB", "/DINLINE=__inline",
110109
"/DUNICODE", "/D_UNICODE", "/DWIN32", "/DIAL", "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN",
@@ -365,45 +364,6 @@ WIN.prismD3D.rcCompiler = rcCompiler;
365364
WIN.prismD3D.rcSource = defaultRcSource
366365
WIN.prismD3D.rcFlags = ["/d", "JFX_FNAME=prism_d3d.dll", "/d", "JFX_INTERNAL_NAME=prismD3D", rcFlags].flatten();
367366

368-
WIN.launcher = [:]
369-
WIN.launcher.compiler = compiler
370-
WIN.launcher.ccFlags = ["/nologo", "/W3", "/MT", "/EHsc", "/D_WINDOWS", "/DUNICODE", "/D_UNICODE", "/DWIN32",
371-
"/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN", "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
372-
ccDebugFlags].flatten();
373-
WIN.launcher.linker = linker
374-
WIN.launcher.linkFlags = ["/link", "/nologo", "/WX", "/SUBSYSTEM:WINDOWS", "user32.lib", "shell32.lib", "advapi32.lib"]
375-
if (IS_DEBUG_NATIVE) WIN.launcher.linkFlags.add("/debug");
376-
377-
WIN.launcherlibrary = [:]
378-
WIN.launcherlibrary.compiler = compiler
379-
WIN.launcherlibrary.ccFlags = ["/nologo", "/W3",
380-
// "/WX",
381-
"/EHsc", "/c", "/D_WINDOWS", "/DUNICODE", "/D_UNICODE", "/DWIN32",
382-
"/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN", "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
383-
ccDebugFlags].flatten();
384-
WIN.launcherlibrary.linker = linker
385-
WIN.launcherlibrary.linkFlags = ["/nologo", "/WX", "/DLL", "/SUBSYSTEM:WINDOWS", "user32.lib", "shell32.lib", "advapi32.lib", "ole32.lib"]
386-
if (IS_DEBUG_NATIVE) WIN.launcherlibrary.linkFlags.add("/debug");
387-
388-
WIN.fxpackager = [:]
389-
WIN.fxpackager.nativeSource = [
390-
file("${project("fxpackager").projectDir}/src/main/native/javapackager/win")]
391-
WIN.fxpackager.compiler = compiler
392-
WIN.fxpackager.ccFlags = ["/nologo", "/W3", "/EHsc", "/MT", "/GS", "/DUNICODE", "/D_UNICODE",
393-
"/DWIN32", "/D_LITTLE_ENDIAN", "/DWIN32_LEAN_AND_MEAN",
394-
"/D_WIN32_WINDOWS=0X0500", "/D_WIN32_WINNT=0X0500",
395-
"/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
396-
"/O2", "-c"]
397-
WIN.fxpackager.linker = linker
398-
WIN.fxpackager.linkFlags = ["/nologo", "/SUBSYSTEM:CONSOLE", "/opt:REF", "/incremental:no", "/manifest", "kernel32.lib", "advapi32.lib"];
399-
WIN.fxpackager.rcSource = file("${project("fxpackager").projectDir}/src/main/native/javapackager/win/javapackager.rc")
400-
WIN.fxpackager.rcCompiler = rcCompiler
401-
WIN.fxpackager.rcFlags = [
402-
"/l", "0x409",
403-
"/d", "JFX_FNAME=javapackager.exe",
404-
"/d", "JFX_INTERNAL_NAME=javapackager",
405-
rcFlags].flatten();
406-
407367
WIN.iio = [:]
408368
WIN.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
409369
WIN.iio.nativeSource = [

‎dependencies/java.base/module-info.java.extra

-28
This file was deleted.

‎dependencies/jdk.jlink/module-info.java.extra

-26
This file was deleted.

0 commit comments

Comments
 (0)