Index: head/java/openjfx8-devel/Makefile =================================================================== --- head/java/openjfx8-devel/Makefile (revision 460607) +++ head/java/openjfx8-devel/Makefile (revision 460608) @@ -1,127 +1,132 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= openjfx8 -DISTVERSION= 8u172-b00 -PORTREVISION= 3 +DISTVERSION= 8u172-b03 PORTEPOCH= 1 CATEGORIES= java x11-toolkits devel MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \ http://hg.openjdk.java.net/openjfx/8u/rt/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/ PKGNAMESUFFIX= -devel MAINTAINER= tobik@FreeBSD.org COMMENT= JavaFX SDK overlay for OpenJDK 8 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= apache-ant>0:devel/apache-ant \ antlr3>0:devel/antlr3 \ gradle>=4.0:devel/gradle \ - ${JAVALIBDIR}/junit.jar:java/junit \ - swt-devel>0:x11-toolkits/swt-devel + ${JAVALIBDIR}/junit.jar:java/junit LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -RUN_DEPENDS= swt-devel>0:x11-toolkits/swt-devel -USES= gettext-runtime jpeg sqlite +USES= gettext-runtime jpeg pkgconfig sqlite USE_GL= gl USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango USE_JAVA= yes JAVA_VERSION= 1.8 USE_LDCONFIG= yes USE_XORG= x11 xtst xxf86vm -OPTIONS_DEFINE= MEDIA TEST WEBKIT +OPTIONS_DEFINE= MEDIA SWT TEST WEBKIT OPTIONS_DEFAULT= MEDIA WEBKIT OPTIONS_SUB= yes -MEDIA_DESC= Build media module +MEDIA_DESC= Media module +SWT_DESC= SWT support MEDIA_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libsndio.so:audio/sndio MEDIA_USES= gmake MEDIA_VARS= COMPILE_MEDIA=true +SWT_BUILD_DEPENDS= swt-devel>0:x11-toolkits/swt-devel +SWT_RUN_DEPENDS= swt-devel>0:x11-toolkits/swt-devel +SWT_VARS= COMPILE_SWT=true + TEST_USES= display:test TEST_VARS= AWT_TEST=true FULL_TEST=true # Gradle calls CMake during the build WEBKIT_BUILD_DEPENDS= cmake:devel/cmake WEBKIT_IMPLIES= MEDIA WEBKIT_LIB_DEPENDS= libicui18n.so:devel/icu -WEBKIT_USES= bison compiler:c++14-lang gmake gperf perl5 pkgconfig \ - python:2.7,build +WEBKIT_USES= bison compiler:c++14-lang gmake gperf perl5 python:2.7,build WEBKIT_USE= GNOME=libxslt,libxml2 \ PERL5=build \ RUBY=yes \ XORG=xcomposite,xdamage,xfixes,xrender,xt WEBKIT_VARS= RUBY_NO_RUN_DEPENDS=yes COMPILE_WEBKIT=true # Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle GRADLE_ENV= GRADLE_USER_HOME=${WRKDIR}/gradle-home \ CC=${CC} CXX=${CXX} GRADLE_RUN= ${SETENV} ${GRADLE_ENV} gradle --no-daemon PLIST_SUB= ARCH=${ARCH} \ JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/rt-${DISTVERSION} # NOTE: This port won't build if ${JAVA_HOME}/jre/lib/ext/jfxrt.jar # already exists on your system. This is not a problem in Poudriere # or Synth but something to be aware of if you're trying to build this # port in a non-pristine environment. # The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the # Linux versions. Prepare the tree, so that we only see the changes # from Linux's Makefile in our own patches. pre-patch: @${CP} -r ${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/linux \ ${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/bsd @${CP} -r ${WRKSRC}/modules/media/src/main/native/gstreamer/projects/linux \ ${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd post-patch: @${CP} ${FILESDIR}/bsd.gradle ${WRKSRC}/buildSrc # Add a *BSD native audio sink to GStreamer-lite instead of using the # bundled ALSA sink. Currently we add an sndio sink, but this is an extension # point for eventually adding an OSS backend (or others) as an option as well. # If you add a new one make sure it registers itself as "bsdaudiosink" as defined # in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp @${MKDIR} ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio @${CP} ${FILESDIR}/gstsndio.c ${FILESDIR}/sndiosink.c ${FILESDIR}/sndiosink.h \ ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio @cd ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \ ${LN} -s gstsndio.c gstbsdaudio.c && \ ${LN} -s sndiosink.c bsdaudiosink.c # Pull Java dependencies from LOCALBASE @${REINPLACE_CMD} 's@/usr/local@${LOCALBASE}@g' \ ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle # Remove the bundled libicu and libsqlite3. We use the system's # versions instead. @${RM} -r ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty/icu \ ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty/sqlite +post-patch-SWT-off: + @${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt + do-configure: @${MKDIR} ${WRKDIR}/gradle-home @${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties .for prop in COMPILE_MEDIA COMPILE_WEBKIT AWT_TEST FULL_TEST @${ECHO_CMD} "${prop} = ${${prop}:Ufalse}" >> ${WRKSRC}/gradle.properties .endfor + @${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle do-build: @cd ${WRKSRC} && ${GRADLE_RUN} zips do-install: @${MKDIR} ${STAGEDIR}${JAVA_HOME} @${TAR} -C ${STAGEDIR}${JAVA_HOME} \ -xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip @${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \; do-test-TEST-on: @cd ${WRKSRC} && ${GRADLE_RUN} check test .include Index: head/java/openjfx8-devel/distinfo =================================================================== --- head/java/openjfx8-devel/distinfo (revision 460607) +++ head/java/openjfx8-devel/distinfo (revision 460608) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506878786 -SHA256 (openjfx8-8u172-b00.tar.gz) = b6689302cb215b22b0b673d47b3738ac48a423149f2e047dbdebbc87fbefc8ac -SIZE (openjfx8-8u172-b00.tar.gz) = 109884684 +TIMESTAMP = 1517218697 +SHA256 (openjfx8-8u172-b03.tar.gz) = 1648bcce3a9f3ee9ac4353f0b3fb896818a3a89440497d0bb8853d22dddf132d +SIZE (openjfx8-8u172-b03.tar.gz) = 107849167 Index: head/java/openjfx8-devel/files/patch-build.properties =================================================================== --- head/java/openjfx8-devel/files/patch-build.properties (revision 460607) +++ head/java/openjfx8-devel/files/patch-build.properties (nonexistent) @@ -1,17 +0,0 @@ -http://hg.openjdk.java.net/openjfx/8u/rt/rev/aefb29b5a599 - ---- build.properties.orig 2017-09-08 16:56:55 UTC -+++ build.properties -@@ -40,10 +40,10 @@ jfx.release.milestone=ea - jfx.release.suffix=-ea - - # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE --jfx.release.name=8u162 -+jfx.release.name=8u172 - jfx.release.major.version=8 - jfx.release.minor.version=0 --jfx.release.micro.version=162 -+jfx.release.micro.version=172 - - ############################################################################## - # Property changes on: head/java/openjfx8-devel/files/patch-build.properties ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c =================================================================== --- head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c (revision 460607) +++ head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c (nonexistent) @@ -1,11 +0,0 @@ ---- modules/media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c.orig 2017-10-04 12:06:08 UTC -+++ modules/media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -@@ -162,7 +162,7 @@ extern HMODULE _priv_gst_dll_handle; - #include - #include - --static const int AVCODEC_EXPLICIT_VERSIONS[] = { 53, 54, 55, 56 }; -+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 53, 54, 55, 56, 57 }; - static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 }; - - typedef unsigned (*avcodec_version_proto)(); Property changes on: head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/openjfx8-devel/files/bsd.gradle =================================================================== --- head/java/openjfx8-devel/files/bsd.gradle (revision 460607) +++ head/java/openjfx8-devel/files/bsd.gradle (revision 460608) @@ -1,258 +1,257 @@ /* * Copyright (c) 2013, 2015, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ ext.BSD = [:] // Declare whether this particular target file applies to the current system BSD.canBuild = IS_BSD; if (!BSD.canBuild) return; // All desktop related packages should be built BSD.compileSwing = true; -BSD.compileSWT = true; BSD.compileFXPackager = true; // Libraries end up in the sdk/rt/lib/$OS_ARCH directory for freebsd BSD.libDest = "lib/$OS_ARCH" // Lambda for naming the generated libs BSD.library = { name -> return "lib${name}.so" as String } // A set of common parameters to use for both compiling and linking def commonFlags = [ "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags if (!IS_64) { commonFlags += "-m32" } // Specify the compilation parameters and link parameters def ccFlags = [ commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c", IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten() //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"]) def linkFlags = ["-shared", commonFlags].flatten() // Create $buildDir/bsd_tools.properties file and load props from it setupTools("bsd_tools", { propFile -> ByteArrayOutputStream results = new ByteArrayOutputStream(); exec { commandLine("pkg-config", "--cflags", "gtk+-2.0", "gthread-2.0", "xtst"); setStandardOutput(results); } propFile << "cflags=" << results.toString().trim() << "\n"; results = new ByteArrayOutputStream(); exec { commandLine "pkg-config", "--libs", "gtk+-2.0", "gthread-2.0", "xtst" standardOutput = results } propFile << "libs=" << results.toString().trim(); }, { properties -> ccFlags.addAll(properties.getProperty("cflags").split(" ")) linkFlags.addAll(properties.getProperty("libs").split(" ")) } ) def pangoCCFlags = ["-D_ENABLE_PANGO"]; def pangoLinkFlags = []; setupTools("bsd_pango_tools", { propFile -> ByteArrayOutputStream results = new ByteArrayOutputStream(); exec { commandLine "pkg-config", "--cflags", "pangoft2" standardOutput = results } propFile << "cflags=" << results.toString().trim() << "\n"; results = new ByteArrayOutputStream(); exec { commandLine "pkg-config", "--libs", "pangoft2" standardOutput = results } propFile << "libs=" << results.toString().trim(); }, { properties -> pangoCCFlags.addAll(properties.getProperty("cflags").split(" ")) pangoLinkFlags.addAll(properties.getProperty("libs").split(" ")) } ) def freetypeCCFlags = [ext.IS_COMPILE_PANGO ? "-D_ENABLE_PANGO" : ext.IS_COMPILE_HARFBUZZ ? "-D_ENABLE_HARFBUZZ" : ""] def freetypeLinkFlags = [] setupTools("bsd_freetype_tools", { propFile -> ByteArrayOutputStream results = new ByteArrayOutputStream(); exec { commandLine "pkg-config", "--cflags", "freetype2" standardOutput = results } propFile << "cflags=" << results.toString().trim() << "\n"; results = new ByteArrayOutputStream(); exec { commandLine "pkg-config", "--libs", "freetype2" standardOutput = results } propFile << "libs=" << results.toString().trim(); }, { properties -> freetypeCCFlags.addAll(properties.getProperty("cflags").split(" ")) freetypeLinkFlags.addAll(properties.getProperty("libs").split(" ")) } ) def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "cc"; def linker = IS_COMPILE_PARFAIT ? "parfait-g++" : "c++"; BSD.glass = [:] BSD.glass.javahInclude = [ "com/sun/glass/events/**", "com/sun/glass/ui/*", "com/sun/glass/ui/gtk/*"] BSD.glass.nativeSource = file("modules/graphics/src/main/native-glass/gtk") BSD.glass.compiler = compiler BSD.glass.ccFlags = [ccFlags, "-Werror"].flatten() BSD.glass.linker = linker BSD.glass.linkFlags = [linkFlags].flatten() BSD.glass.lib = "glass" BSD.decora = [:] BSD.decora.compiler = compiler BSD.decora.ccFlags = [ccFlags, "-ffast-math"].flatten() BSD.decora.linker = linker BSD.decora.linkFlags = [linkFlags].flatten() BSD.decora.lib = "decora_sse" BSD.prism = [:] BSD.prism.javahInclude = ["com/sun/prism/impl/**/*", "com/sun/prism/PresentableState*"] BSD.prism.nativeSource = file("modules/graphics/src/main/native-prism") BSD.prism.compiler = compiler BSD.prism.ccFlags = [ccFlags, "-DINLINE=inline"].flatten() BSD.prism.linker = linker BSD.prism.linkFlags = [linkFlags].flatten() BSD.prism.lib = "prism_common" BSD.prismSW = [:] BSD.prismSW.javahInclude = ["com/sun/pisces/**/*"] BSD.prismSW.nativeSource = file("modules/graphics/src/main/native-prism-sw") BSD.prismSW.compiler = compiler BSD.prismSW.ccFlags = [ccFlags, "-DINLINE=inline"].flatten() BSD.prismSW.linker = linker BSD.prismSW.linkFlags = [linkFlags].flatten() BSD.prismSW.lib = "prism_sw" BSD.launcher = [:] BSD.launcher.compiler = compiler BSD.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c"] BSD.launcher.linker = linker BSD.launcher.linkFlags = ["-ldl"] if (!IS_64) { BSD.launcher.ccFlags += "-m32" BSD.launcher.linkFlags += "-m32" } BSD.launcherlibrary = [:] BSD.launcherlibrary.compiler = compiler BSD.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c", "-fPIC"] BSD.launcherlibrary.linker = linker BSD.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"] if (!IS_64) { BSD.launcherlibrary.ccFlags += "-m32" BSD.launcherlibrary.linkFlags += "-m32" } BSD.iio = [:] BSD.iio.javahInclude = ["com/sun/javafx/iio/**/*"] BSD.iio.nativeSource = [file("modules/graphics/src/main/native-iio")] BSD.iio.compiler = compiler BSD.iio.ccFlags = [ccFlags].flatten() BSD.iio.linker = linker BSD.iio.linkFlags = [linkFlags].flatten() BSD.iio.linkFlags += "-ljpeg" BSD.iio.lib = "javafx_iio" BSD.prismES2 = [:] BSD.prismES2.javahInclude = ["com/sun/prism/es2/**/*"] BSD.prismES2.nativeSource = [ file("modules/graphics/src/main/native-prism-es2"), file("modules/graphics/src/main/native-prism-es2/GL"), file("modules/graphics/src/main/native-prism-es2/x11") ] BSD.prismES2.compiler = compiler BSD.prismES2.ccFlags = ["-DFREEBSD", ccFlags].flatten() BSD.prismES2.linker = linker BSD.prismES2.linkFlags = [linkFlags, "-lX11", "-lXxf86vm", "-lGL"].flatten() BSD.prismES2.lib = "prism_es2" def closedDir = file("$projectDir/../rt-closed") BSD.font = [:] BSD.font.javahInclude = [ "com/sun/javafx/font/**/*", "com/sun/javafx/text/**/*"] BSD.font.compiler = compiler BSD.font.nativeSource = [file("modules/graphics/src/main/native-font")] BSD.font.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten() BSD.font.linker = linker BSD.font.linkFlags = [linkFlags].flatten() BSD.font.lib = "javafx_font" BSD.fontT2K = [:] BSD.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"] BSD.fontT2K.nativeSource = [ file("$closedDir/javafx-font-t2k-native/src"), file("$closedDir/javafx-font-t2k-native/src/layout")] BSD.fontT2K.compiler = compiler BSD.fontT2K.ccFlags = ["-DJFXFONT_PLUS", "-DLE_STANDALONE", ccFlags].flatten() BSD.fontT2K.linker = linker BSD.fontT2K.linkFlags = [linkFlags].flatten() BSD.fontT2K.lib = "javafx_font_t2k" BSD.fontFreetype = [:] BSD.fontFreetype.javahInclude = ["com/sun/javafx/font/freetype/OSFreetype.class"] BSD.fontFreetype.nativeSource = ["src/main/native-font/freetype.c"] BSD.fontFreetype.compiler = compiler BSD.fontFreetype.ccFlags = ["-DJFXFONT_PLUS", ccFlags, freetypeCCFlags].flatten() BSD.fontFreetype.linker = linker BSD.fontFreetype.linkFlags = [linkFlags, freetypeLinkFlags].flatten() BSD.fontFreetype.lib = "javafx_font_freetype" BSD.fontPango = [:] BSD.fontPango.javahInclude = ["com/sun/javafx/font/freetype/OSPango.class"] BSD.fontPango.nativeSource = ["src/main/native-font/pango.c"] BSD.fontPango.compiler = compiler BSD.fontPango.ccFlags = ["-DJFXFONT_PLUS", ccFlags, pangoCCFlags].flatten() BSD.fontPango.linker = linker BSD.fontPango.linkFlags = [linkFlags, pangoLinkFlags].flatten() BSD.fontPango.lib = "javafx_font_pango" BSD.media = [:] BSD.media.compiler = compiler BSD.media.linker = linker BSD.media.lib = "ar" Index: head/java/openjfx8-devel/files/patch-build.gradle =================================================================== --- head/java/openjfx8-devel/files/patch-build.gradle (revision 460607) +++ head/java/openjfx8-devel/files/patch-build.gradle (revision 460608) @@ -1,457 +1,457 @@ ---- build.gradle.orig 2017-09-08 16:56:55 UTC +--- build.gradle.orig 2018-01-16 01:40:56 UTC +++ build.gradle @@ -251,6 +251,7 @@ ext.IS_64 = OS_ARCH.toLowerCase().contains("64") ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin") ext.IS_WINDOWS = OS_NAME.contains("windows") ext.IS_LINUX = OS_NAME.contains("linux") +ext.IS_BSD = OS_NAME.contains("freebsd") || OS_NAME.contains("dragonfly") // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified, // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, and/or JAVAH, all of which may be specified @@ -311,7 +312,7 @@ defineProperty("COMPILE_MEDIA", "false") ext.IS_COMPILE_MEDIA = Boolean.parseBoolean(COMPILE_MEDIA) // COMPILE_PANGO specifies whether to build javafx_font_pango. -defineProperty("COMPILE_PANGO", "${IS_LINUX}") +defineProperty("COMPILE_PANGO", "${IS_LINUX || IS_BSD}") ext.IS_COMPILE_PANGO = Boolean.parseBoolean(COMPILE_PANGO) // COMPILE_HARFBUZZ specifies whether to use Harfbuzz. @@ -342,7 +343,8 @@ ext.SWT_FILE_NAME = IS_MAC ? "org.eclipse.swt.cocoa.ma IS_WINDOWS && IS_64 ? "org.eclipse.swt.win32.win32.x86_64_3.7.2.v3740f" : IS_WINDOWS && !IS_64 ? "org.eclipse.swt.win32.win32.x86_3.7.2.v3740f" : IS_LINUX && IS_64 ? "org.eclipse.swt.gtk.linux.x86_64_3.7.2.v3740f" : - IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.7.2.v3740f" : "" + IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.7.2.v3740f" : + IS_BSD ? "/usr/local/share/java/classes/swt-devel.jar" : "" // Build javadocs only if BUILD_JAVADOC=true defineProperty("BUILD_JAVADOC", "false") @@ -402,6 +404,12 @@ if (IS_MAC) { defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}") } +if (IS_BSD) { + ext.MAKE_CMD = "gmake" +} else { + ext.MAKE_CMD = "make" +} + // // The next three sections of properties are used to generate the // VersionInfo class, and the Windows DLL manifest. @@ -442,7 +450,7 @@ defineProperty("RELEASE_MILESTONE", jfxReleaseMileston // Check whether the COMPILE_TARGETS property has been specified (if so, it was done by // the user and not by this script). If it has not been defined then default // to building the normal desktop build for this machine -project.ext.set("defaultHostTarget", IS_MAC ? "mac" : IS_WINDOWS ? "win" : IS_LINUX ? "linux" : ""); +project.ext.set("defaultHostTarget", IS_MAC ? "mac" : IS_WINDOWS ? "win" : IS_LINUX ? "linux" : IS_BSD ? "bsd" : ""); defineProperty("COMPILE_TARGETS", "$defaultHostTarget") // Flag indicating whether to import cross compile tools @@ -549,7 +557,7 @@ void fetchExternalTools(String configName, List packag def File pkgdir = file("$destdir/$basename") if (pkgname.endsWith(".tgz")) { - if (IS_LINUX || IS_MAC) { + if (IS_BSD || IS_LINUX || IS_MAC) { // use native tar to support symlinks pkgdir.mkdirs() exec { @@ -674,7 +682,7 @@ compileTargets { t -> if (!targetProperties.containsKey('includeMonocle')) targetProperties.includeMonocle = false if (!targetProperties.containsKey('includeEGL')) targetProperties.includeEGL = false - if (!targetProperties.containsKey('includeGTK')) targetProperties.includeGTK = IS_LINUX + if (!targetProperties.containsKey('includeGTK')) targetProperties.includeGTK = IS_LINUX || IS_BSD // This value is used to under ./build/${sdkDirName} to allow for // a common name for the hosted build (for use when building apps) @@ -706,7 +714,7 @@ compileTargets { t -> // at present building on PI is not supported, but we would only need to make // some changes on assumptions on what should be built (like SWT / Swing) and // such and we could probably make it work. -if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}") +if (!IS_MAC && !IS_WINDOWS && !IS_LINUX && !IS_BSD) logger.error("Unsupported build OS ${OS_NAME}") if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { throw new Exception("Unknown and unsupported build architecture: $OS_ARCH") } else if (IS_MAC && OS_ARCH != "x86_64") { -@@ -1168,7 +1176,8 @@ allprojects { +@@ -1169,7 +1177,8 @@ allprojects { // By default all of our projects require junit for testing so we can just // setup this dependency here. dependencies { - testCompile group: "junit", name: "junit", version: "4.8.2" + testCompile files("/usr/local/share/java/classes/junit4.jar", + "/usr/local/share/java/classes/hamcrest.jar") if (BUILD_CLOSED && DO_JCOV) { testCompile name: "jcov" } -@@ -1306,12 +1315,15 @@ project(":graphics") { +@@ -1307,12 +1316,15 @@ project(":graphics") { dependencies { compile project(":base"), BUILD_SRC - compile name: SWT_FILE_NAME - stubCompile group: "junit", name: "junit", version: "4.8.2", + if (IS_BSD) { + compile files(SWT_FILE_NAME) + } else { + compile name: SWT_FILE_NAME + } + stubCompile files("/usr/local/share/java/classes/junit4.jar", + "/usr/local/share/java/classes/hamcrest.jar"), project(":base").sourceSets.test.output, sourceSets.main.output - antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" - antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" - antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" + antlr3 files("/usr/local/share/java/classes/antlr-3.5.2-complete.jar") } // Create a single "native" task which will depend on all the individual native tasks for graphics -@@ -1460,7 +1472,7 @@ project(":graphics") { +@@ -1461,7 +1473,7 @@ project(":graphics") { workingDir = "modules/graphics" main = settings.generator classpath = configurations.compile + configurations.antlr3 - classpath += files("$buildDir/classes/main") + classpath += files("$buildDir/classes/java/main") classpath += files("$buildDir/classes/jsl-compilers/decora") args = ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/scenario/effect", "$settings.outputs", "$settings.fileName"] jvmArgs "-Djava.ext.dirs=" -@@ -1471,9 +1483,9 @@ project(":graphics") { +@@ -1472,9 +1484,9 @@ project(":graphics") { task generateDecoraNativeHeaders(type: JavaHeaderTask, dependsOn: compileDecoraJavaShaders) { description = "Generates JNI Headers for Decora SSE Natives" source file("$buildDir/classes/jsl-decora") - source file("$buildDir/classes/main") + source file("$buildDir/classes/java/main") include("com/sun/scenario/effect/impl/sw/sse/*"); - classpath = files("$buildDir/classes/main", "$buildDir/classes/jsl-decora") + classpath = files("$buildDir/classes/java/main", "$buildDir/classes/jsl-decora") output = file("$buildDir/generated-src/headers/jsl-decora") } -@@ -1601,9 +1613,7 @@ project(":graphics") { +@@ -1602,9 +1614,7 @@ project(":graphics") { copy { into libsDir from f.getParentFile() - include "**/antlr-3.1.3.jar" - include "**/stringtemplate-3.2.jar" - include "**/antlr-runtime-3.1.3.jar" + include "**/antlr-3.5.2-complete.jar" includeEmptyDirs = false } // Have to rename the swt jar because it is some platform specific name but -@@ -1650,7 +1660,7 @@ project(":controls") { +@@ -1651,7 +1661,7 @@ project(":controls") { javaexec { executable = JAVA workingDir = "modules/controls" - classpath files("$buildDir/classes/main", + classpath files("$buildDir/classes/java/main", project(":graphics").sourceSets.main.output, project(":base").sourceSets.main.output) main = "com.sun.javafx.css.parser.Css2Bin" -@@ -1687,7 +1697,11 @@ project(":swt") { +@@ -1688,7 +1698,11 @@ project(":swt") { } dependencies { compile BUILD_SRC, project(":base"), project(":graphics") - compile name: SWT_FILE_NAME + if (IS_BSD) { + compile files(SWT_FILE_NAME) + } else { + compile name: SWT_FILE_NAME + } } } -@@ -1786,7 +1800,7 @@ project(":fxpackager") { +@@ -1787,7 +1801,7 @@ project(":fxpackager") { } dependencies { - compile group: "org.apache.ant", name: "ant", version: "1.8.2" + compile files("/usr/local/share/java/apache-ant/lib/ant.jar") } // When producing the jar, we need to relocate a few class files -@@ -2037,7 +2051,7 @@ project(":fxpackager") { +@@ -2038,7 +2052,7 @@ project(":fxpackager") { description = "Creates the packager.jar" archiveName = "packager.jar"; includeEmptyDirs = false - from("$buildDir/classes/main"); + from("$buildDir/classes/java/main"); from("$buildDir/resources/main"); include('jdk/packager/**') -@@ -2047,21 +2061,6 @@ project(":fxpackager") { +@@ -2048,21 +2062,6 @@ project(":fxpackager") { jar.dependsOn buildJavaPackager jar.dependsOn packagerJar - classes << { - // Copy all of the download libraries to libs directory for the sake of the IDEs - File libsDir = rootProject.file("build/libs"); - File antLib = new File(libsDir, "ant-1.8.2.jar") - libsDir.mkdirs(); - for (File f : configurations.compile.files) { - copy { - into libsDir - from f.getParentFile() - include "**/ant-1.8.2.jar" - includeEmptyDirs = false - } - } - } - task packagerFakeJar(type: Jar) { dependsOn compileTestJava from compileTestJava.destinationDir -@@ -2240,7 +2239,7 @@ project(":media") { +@@ -2241,7 +2240,7 @@ project(":media") { doLast { exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}") args("JAVA_HOME=${JDK_HOME}", "GENERATED_HEADERS_DIR=${generatedHeadersDir}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=jfxmedia", "COMPILE_PARFAIT=${compileParfait}") -@@ -2250,7 +2249,7 @@ project(":media") { +@@ -2251,7 +2250,7 @@ project(":media") { args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.jfxmediaRcFile}") } else { args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}") - if (t.name == "linux") { + if (t.name == "linux" || t.name == "bsd") { args(IS_64 ? "ARCH=x64" : "ARCH=x32") } -@@ -2272,7 +2271,7 @@ project(":media") { +@@ -2273,7 +2272,7 @@ project(":media") { enabled = IS_COMPILE_MEDIA doLast { exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite") args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite") if (t.name == "win") { -@@ -2280,7 +2279,7 @@ project(":media") { +@@ -2281,7 +2280,7 @@ project(":media") { args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.gstreamerRcFile}") } else { args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}") - if (t.name == "linux") { + if (t.name == "linux" || t.name == "bsd") { args(IS_64 ? "ARCH=x64" : "ARCH=x32") } } -@@ -2301,7 +2300,7 @@ project(":media") { +@@ -2302,7 +2301,7 @@ project(":media") { doLast { exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins") args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=fxplugins", "ON2_SRCDIR=${project.ext.ON2_SRCDIR}", "ON2_LIB=${project.ext.ON2_LIB}") -@@ -2318,7 +2317,7 @@ project(":media") { +@@ -2319,7 +2318,7 @@ project(":media") { args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.fxpluginsRcFile}") } else { args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}") - if (t.name == "linux") { + if (t.name == "linux" || t.name == "bsd") { args(IS_64 ? "ARCH=x64" : "ARCH=x32") } } -@@ -2328,7 +2327,7 @@ project(":media") { +@@ -2329,7 +2328,7 @@ project(":media") { buildNative.dependsOn buildPlugins - if (t.name == "linux") { + if (t.name == "linux" || t.name == "bsd") { def buildAVPlugin = task( "buildAVPlugin", dependsOn: [buildPlugins]) { enabled = IS_COMPILE_MEDIA -@@ -2339,7 +2338,7 @@ project(":media") { +@@ -2340,7 +2339,7 @@ project(":media") { File dir = file(libavDir) if (dir.exists()) { exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${t.name}/avplugin") args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}", "SUFFIX=", IS_64 ? "ARCH=x64" : "ARCH=x32") -@@ -2352,7 +2351,7 @@ project(":media") { +@@ -2353,7 +2352,7 @@ project(":media") { File dir = file(libavDir) if (dir.exists()) { exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${t.name}/avplugin") args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}", -@@ -2363,7 +2362,7 @@ project(":media") { +@@ -2364,7 +2363,7 @@ project(":media") { } else { // Building fxavcodec plugin (libav plugin) exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin") args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=avplugin", IS_64 ? "ARCH=x64" : "ARCH=x32") } -@@ -2411,7 +2410,7 @@ project(":media") { +@@ -2412,7 +2411,7 @@ project(":media") { doLast { exec { environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT) - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite") args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite", IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.glibRcFile}") } -@@ -2424,7 +2423,7 @@ project(":media") { +@@ -2425,7 +2424,7 @@ project(":media") { enabled = IS_COMPILE_MEDIA doLast { exec { - commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite") + commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite") args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite") args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}") } -@@ -2477,7 +2476,7 @@ project(":web") { +@@ -2478,7 +2477,7 @@ project(":web") { task generateHeaders(dependsOn: compileJava) { doLast { - def classpath = files("$buildDir/classes/main", + def classpath = files("$buildDir/classes/java/main", project(":graphics").sourceSets.main.output.classesDir) def dest = file("$buildDir/generated-src/headers"); mkdir dest; @@ -2525,7 +2524,7 @@ project(":web") { compileTargets { t -> def targetProperties = project.rootProject.ext[t.upper] - def classifier = (t.name != "linux" && t.name != "win") ? t.name : + def classifier = (t.name != "linux" && t.name != "bsd" && t.name != "win") ? t.name : IS_64 ? "${t.name}-amd64" : "${t.name}-i586" def webkitOutputDir = cygpath("$buildDir/${t.name}") -@@ -2586,6 +2585,9 @@ project(":web") { +@@ -2592,6 +2591,9 @@ project(":web") { targetCpuBitDepthSwitch = "--32-bit" } + cmakeArgs += " -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" + cmakeArgs += " -DCMAKE_C_COMPILER:STRING=${System.getenv("CC")}" + cmakeArgs += " -DCMAKE_CXX_COMPILER:STRING=${System.getenv("CXX")}" - commandLine("perl", "Tools/Scripts/build-webkit", + commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/build-webkit", "--java", "--icu-unicode", targetCpuBitDepthSwitch, "--cmakeargs=${cmakeArgs}") -@@ -2628,7 +2630,7 @@ project(":web") { +@@ -2634,7 +2636,7 @@ project(":web") { task drtJar(type: Jar, dependsOn: compileJava) { archiveName = "drt.jar" destinationDir = file("$buildDir/test") - from "$buildDir/classes/main" + from "$buildDir/classes/java/main" include drtClasses } if (IS_COMPILE_WEBKIT) { -@@ -2880,22 +2882,22 @@ compileTargets { t -> +@@ -2886,22 +2888,22 @@ compileTargets { t -> description = "Creates the jfxrt.jar for the $t.name target" archiveName = "build/${sdkDirName}/rt/lib/ext/jfxrt.jar"; includeEmptyDirs = false - from("modules/base/build/classes/main", + from("modules/base/build/classes/java/main", "modules/base/build/resources/main", - "modules/builders/build/classes/main", - "modules/graphics/build/classes/main", + "modules/builders/build/classes/java/main", + "modules/graphics/build/classes/java/main", "modules/graphics/build/resources/main", - "modules/controls/build/classes/main", + "modules/controls/build/classes/java/main", "modules/controls/build/resources/main", - "modules/fxml/build/classes/main", + "modules/fxml/build/classes/java/main", "modules/fxml/build/resources/main", "modules/graphics/build/classes/jsl-decora", "modules/graphics/build/resources/jsl-decora", "modules/graphics/build/classes/jsl-prism", "modules/graphics/build/resources/jsl-prism", - "modules/media/build/classes/main", + "modules/media/build/classes/java/main", "modules/media/build/resources/main") - if (COMPILE_SWING) from ("modules/swing/build/classes/main", "modules/swing/build/resources/main") + if (COMPILE_SWING) from ("modules/swing/build/classes/java/main", "modules/swing/build/resources/main") if (!IS_MAC) { exclude ("modules/media/build/classes/main/com/sun/media/jfxmediaimpl/platform/osx/**", -@@ -2960,7 +2962,7 @@ compileTargets { t -> +@@ -2966,7 +2968,7 @@ compileTargets { t -> "modules/web/build/resources/ios", "modules/extensions/build/classes/ios") } else { - from ("modules/web/build/classes/main", "modules/web/build/resources/main") + from ("modules/web/build/classes/java/main", "modules/web/build/resources/main") } exclude("**/javafx/embed/swt/**") -@@ -3000,8 +3002,8 @@ compileTargets { t -> +@@ -3007,8 +3009,8 @@ compileTargets { t -> description = "Creates the jfxswt.jar for the $t.name target" archiveName = "build/${sdkDirName}/rt/lib/jfxswt.jar"; includeEmptyDirs = false - from("modules/swt/build/classes/main"); - from("modules/builders/build/classes/main"); + from("modules/swt/build/classes/java/main"); + from("modules/builders/build/classes/java/main"); include("**/javafx/embed/swt/**") exclude("**/*.java"); // Builder java files are in build/classes and should be excluded -@@ -3022,7 +3024,7 @@ compileTargets { t -> +@@ -3029,7 +3031,7 @@ compileTargets { t -> description = "Creates the javafx-mx.jar" archiveName = "build/${sdkDirName}/lib/javafx-mx.jar"; includeEmptyDirs = false - from "modules/jmx/build/classes/main" + from "modules/jmx/build/classes/java/main" from "modules/jmx/build/resources/main" dependsOn project(":jmx").assemble } -@@ -3077,7 +3079,7 @@ compileTargets { t -> +@@ -3084,7 +3086,7 @@ compileTargets { t -> // OSX media natives [ "jfxmedia_qtkit", "jfxmedia_avf", "glib-lite" ].each { name -> from ("modules/media/build/native/${t.name}/${mediaBuildType}/${library(name)}") } - } else if (t.name == "linux") { + } else if (t.name == "linux" || t.name == "bsd") { from("modules/media/build/native/${t.name}/${mediaBuildType}") { include "libavplugin*.so" } } else from ("modules/media/build/native/${t.name}/${mediaBuildType}/${library("glib-lite")}") } else { -@@ -3090,7 +3092,7 @@ compileTargets { t -> +@@ -3097,7 +3099,7 @@ compileTargets { t -> // copy libjfxmedia_{avf,qtkit}.dylib if they exist [ "jfxmedia_qtkit", "jfxmedia_avf", "glib-lite" ].each { name -> from ("$LIBRARY_STUB/${library(name)}") } - } else if (t.name == "linux") { + } else if (t.name == "linux" || t.name == "bsd") { from(LIBRARY_STUB) { include "libavplugin*.so" } } else if (t.name != "android" && t.name != "dalvik" ) { -@@ -3155,7 +3157,7 @@ compileTargets { t -> +@@ -3162,7 +3164,7 @@ compileTargets { t -> } // Copy over the javapackager executable - if (t.name == "win" || t.name == "linux" || t.name == "mac") { + if (t.name == "win" || t.name == "linux" || t.name == "bsd" || t.name == "mac") { copy { from "modules/fxpackager/build/javapackager" into "build/${sdkDirName}/bin" -@@ -3208,10 +3210,11 @@ ext.JFXRT_CP = +@@ -3215,10 +3217,11 @@ ext.JFXRT_CP = project(":fxml").sourceSets.main.output.classesDir, project(":swing").sourceSets.main.output.classesDir, //NOTE - used by 3Dviewer project(":builders").sourceSets.main.output.classesDir, - "modules/media/build/classes/main", - "modules/web/build/classes/main", + "modules/media/build/classes/java/main", + "modules/web/build/classes/java/main", ) +/* project(":apps") { // The apps build is Ant based, and gradle lets us "import" ant build.xml // into our configuration. -@@ -3256,7 +3259,7 @@ project(":apps") { +@@ -3295,7 +3298,7 @@ project(":apps") { } rootProject.clean.dependsOn(appsClean) } -} +} */ /****************************************************************************** * * Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_CMakeLists.txt =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_CMakeLists.txt (revision 460607) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_CMakeLists.txt (revision 460608) @@ -1,10 +1,10 @@ ---- modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt.orig 2017-09-08 16:56:55 UTC +--- modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt.orig 2018-01-16 01:40:56 UTC +++ modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt -@@ -309,6 +309,7 @@ list(APPEND WTF_SOURCES +@@ -343,6 +343,7 @@ list(APPEND WTF_SOURCES ) set(WTF_SYSTEM_INCLUDE_DIRECTORIES ${ICU_INCLUDE_DIRS} + ${CMAKE_INSTALL_PREFIX}/include ) list(APPEND WTF_LIBRARIES ${ICU_DATA_LIBRARIES} Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_unicode_java_UnicodeJava.h =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_unicode_java_UnicodeJava.h (revision 460607) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_unicode_java_UnicodeJava.h (revision 460608) @@ -1,24 +1,24 @@ ---- modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h.orig 2017-09-08 16:56:55 UTC +--- modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h.orig 2018-01-16 01:40:56 UTC +++ modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h @@ -15,21 +15,6 @@ - #define CharProp(p) java_lang_Character_##p + #define CharProp(p) com_sun_webkit_dom_CharacterDataImpl_##p -#if PLATFORM(JAVA) && OS(WINDOWS) -typedef wchar_t UChar; -#else -typedef uint16_t UChar; -#endif - -// #ifdef UChar32 -// #undef UChar32 -// #endif - -#ifndef __UMACHINE_H__ //XXX: recheck -typedef uint32_t UChar32; -#endif - -#define U_MASK(x) ((uint32_t)1<<(x)) #define USE_FAST_PATH(c, fast, slow) ((c) <= 0x7F ? fast((char)c) : slow(c)) #define CHECK_PROPERTY(c, mask, isSet) \ Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_PlatformJava.cmake =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_PlatformJava.cmake (revision 460607) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_PlatformJava.cmake (revision 460608) @@ -1,11 +1,11 @@ ---- modules/web/src/main/native/Source/WebCore/PlatformJava.cmake.orig 2017-09-08 16:56:55 UTC +--- modules/web/src/main/native/Source/WebCore/PlatformJava.cmake.orig 2018-01-16 01:40:56 UTC +++ modules/web/src/main/native/Source/WebCore/PlatformJava.cmake -@@ -239,7 +239,7 @@ set(WebCore_FORWARDING_HEADERS_FILES +@@ -242,7 +242,7 @@ set(WebCore_FORWARDING_HEADERS_FILES set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/java/RenderThemeJava.cpp) list(APPEND WebCore_LIBRARIES - SqliteJava + ${CMAKE_INSTALL_PREFIX}/lib/libsqlite3.so ${ICU_I18N_LIBRARIES} ${ICU_LIBRARIES} ) Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake (revision 460607) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake (revision 460608) @@ -1,26 +1,26 @@ ---- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig 2017-09-08 16:56:55 UTC +--- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig 2018-01-16 01:40:56 UTC +++ modules/web/src/main/native/Source/cmake/OptionsJava.cmake @@ -52,9 +52,9 @@ elseif (APPLE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) elseif (UNIX) #### ICU #### - set(ICU_JAVA_COMMON_LIB icuuc) - set(ICU_I18N_LIBRARIES icui18n) - set(ICU_JAVA_DATA_LIB ${CMAKE_BINARY_DIR}/lib/libicudata.a) + set(ICU_JAVA_COMMON_LIB ${CMAKE_INSTALL_PREFIX}/lib/libicuuc.so) + set(ICU_I18N_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libicui18n.so) + set(ICU_JAVA_DATA_LIB ${CMAKE_INSTALL_PREFIX}/lib/libicudata.so) #### ICU-END #### find_package(LibXml2 2.7.0 REQUIRED) -@@ -233,8 +233,9 @@ if (CMAKE_MAJOR_VERSION LESS 3) +@@ -191,8 +191,9 @@ if (CMAKE_MAJOR_VERSION LESS 3) endif () set(ICU_INCLUDE_DIRS + "${CMAKE_INSTALL_PREFIX}/include" "${THIRDPARTY_DIR}/icu/source/common" "${THIRDPARTY_DIR}/icu/source/i18n" ) - +set(ICU_LIBRARIES ${ICU_JAVA_COMMON_LIB} ${ICU_JAVA_DATA_LIB}) Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp (revision 460607) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp (revision 460608) @@ -1,11 +1,11 @@ ---- modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp.orig 2017-09-08 16:56:55 UTC +--- modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp.orig 2018-01-16 01:40:56 UTC +++ modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp -@@ -2410,7 +2410,7 @@ void TestRunner::runUIScript(JSContextRef context, JSS +@@ -2400,7 +2400,7 @@ void TestRunner::runUIScript(JSContextRef context, JSS if (!m_UIScriptContext) m_UIScriptContext = std::make_unique(*this); - String scriptString(JSStringGetCharactersPtr(script), JSStringGetLength(script)); + String scriptString(reinterpret_cast(JSStringGetCharactersPtr(script)), JSStringGetLength(script)); m_UIScriptContext->runUIScript(scriptString, callbackID); } Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_java_CMakeLists.txt =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_java_CMakeLists.txt (revision 460607) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_java_CMakeLists.txt (revision 460608) @@ -1,13 +1,13 @@ ---- modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt.orig 2017-09-08 16:56:55 UTC +--- modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt.orig 2018-01-16 01:40:56 UTC +++ modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt -@@ -89,9 +89,7 @@ add_library(DumpRenderTreeJava SHARED ${DumpRenderTree +@@ -90,9 +90,7 @@ add_library(DumpRenderTreeJava SHARED ${DumpRenderTree add_definitions(-DWEBCORE_EXPORT=WTF_IMPORT -DWEBCORE_TESTSUPPORT_EXPORT=WTF_IMPORT) add_dependencies(DumpRenderTreeJava DumpRenderTreeBindings) -if (UNIX AND NOT APPLE) - set_target_properties(DumpRenderTreeJava PROPERTIES LINK_FLAGS "-Wl,--no-undefined") -elseif (WIN32) +if (WIN32) # Workaround for MSBuild. It always creates Release|Debug folder # according to the build type on each target. install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/DumpRenderTreeJava.dll DESTINATION ${CMAKE_BINARY_DIR}/lib OPTIONAL) Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_Scripts_webkitdirs.pm =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_Scripts_webkitdirs.pm (revision 460607) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_Scripts_webkitdirs.pm (revision 460608) @@ -1,11 +1,11 @@ ---- modules/web/src/main/native/Tools/Scripts/webkitdirs.pm.orig 2017-09-08 16:56:55 UTC +--- modules/web/src/main/native/Tools/Scripts/webkitdirs.pm.orig 2018-01-16 01:40:56 UTC +++ modules/web/src/main/native/Tools/Scripts/webkitdirs.pm -@@ -1957,7 +1957,7 @@ sub generateBuildSystemFromCMakeProject +@@ -2061,7 +2061,7 @@ sub generateBuildSystemFromCMakeProject chdir($buildPath) or die; # We try to be smart about when to rerun cmake, so that we can have faster incremental builds. - my $willUseNinja = canUseNinja() && canUseNinjaGenerator(); + my $willUseNinja = 0; # canUseNinja() && canUseNinjaGenerator(); if (-e cmakeCachePath() && -e cmakeGeneratedBuildfile($willUseNinja)) { return 0; } Index: head/java/openjfx8-devel/pkg-plist =================================================================== --- head/java/openjfx8-devel/pkg-plist (revision 460607) +++ head/java/openjfx8-devel/pkg-plist (revision 460608) @@ -1,22 +1,22 @@ %%JAVA_HOME%%/bin/javafxpackager %%JAVA_HOME%%/bin/javapackager %%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libavplugin.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libdecora_sse.so %%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libfxplugins.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libglass.so %%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libgstreamer-lite.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font_freetype.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font_pango.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_iio.so %%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjfxmedia.so %%WEBKIT%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjfxwebkit.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_common.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_es2.so %%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_sw.so %%JAVA_HOME%%/jre/lib/ext/jfxrt.jar %%JAVA_HOME%%/jre/lib/javafx.properties -%%JAVA_HOME%%/jre/lib/jfxswt.jar +%%SWT%%%%JAVA_HOME%%/jre/lib/jfxswt.jar %%JAVA_HOME%%/lib/ant-javafx.jar %%JAVA_HOME%%/lib/javafx-mx.jar %%JAVA_HOME%%/lib/packager.jar