Skip to content
This repository was archived by the owner on Jun 24, 2021. It is now read-only.

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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 17 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/rt.iml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 2 additions & 662 deletions
Large diffs are not rendered by default.

buildSrc/android.gradle

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 0 additions & 21 deletions
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"),

0 commit comments

Comments
 (0)