This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libnb-platform-java.
commit 21615aaf7d5810f2777c507a059366b8f51b51e2 Author: Markus Koschany <[email protected]> Date: Tue Dec 15 01:00:05 2015 +0100 Drop debian/patches/netbeans-platform-windowslauncher.patch --- .../netbeans-platform-windowslauncher.patch | 379 --------------------- debian/patches/series | 1 - 2 files changed, 380 deletions(-) diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch deleted file mode 100644 index 7aa62d9..0000000 --- a/debian/patches/netbeans-platform-windowslauncher.patch +++ /dev/null @@ -1,379 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 1 Jun 2015 15:29:10 +0200 -Subject: netbeans platform windowslauncher - -Use mingw32 to build the windows launchers. These are useful if the Netbeans -platform is used to build another application on Debian which you want to be -able to run on a Windows system. - -Forwarded: not-needed ---- - apisupport.harness/windows-launcher-src/Makefile | 7 ++--- - .../nbproject/Makefile-app.exe.mk | 24 ++++++++--------- - .../nbproject/Makefile-app64.exe.mk | 16 ++++++------ - ide/launcher/windows/nblauncher.cpp | 1 + - o.n.bootstrap/launcher/windows/Makefile | 18 +++++-------- - .../launcher/windows/nbproject/Makefile-nbexec.mk | 30 +++++++++++----------- - .../windows/nbproject/Makefile-nbexec64.mk | 26 +++++++++---------- - o.n.bootstrap/launcher/windows/utilsfuncs.cpp | 1 + - 8 files changed, 61 insertions(+), 62 deletions(-) - -diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile -index c7d6f5e..f5499dc 100644 ---- a/apisupport.harness/windows-launcher-src/Makefile -+++ b/apisupport.harness/windows-launcher-src/Makefile -@@ -17,7 +17,7 @@ - MKDIR=mkdir - CP=cp - CCADMIN=CCadmin --RANLIB=ranlib -+RANLIB=i686-w64-mingw32-ranlib - - - -@@ -28,10 +28,10 @@ build: .build-post - # Add your pre 'build' code here... - - .build-pre-app.exe: app.rc -- windres -oapp.res -Ocoff app.rc -+ i686-w64-mingw32-windres -oapp.res -Ocoff app.rc - - .build-pre-app64.exe: app.rc -- x86_64-w64-mingw32-windres.exe -oapp64.res -Ocoff app.rc -+ x86_64-w64-mingw32-windres -oapp64.res -Ocoff app.rc - - .build-post: .build-impl - # Add your post 'build' code here... -@@ -40,6 +40,7 @@ build: .build-post - - # clean - clean: .clean-post -+ -rm -f app.res app64.res - - .clean-pre: - # Add your pre 'clean' code here... -diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk -index c96635b..3859387 100644 ---- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk -+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk -@@ -13,12 +13,12 @@ CP=cp - GREP=grep - NM=nm - CCADMIN=CCadmin --RANLIB=ranlib --CC=gcc.exe --CCC=g++.exe --CXX=g++.exe --FC=gfortran --AS=as.exe -+RANLIB=i686-w64-mingw32-ranlib -+CC= -+CCC=i686-w64-mingw32-g++ -+CXX=i686-w64-mingw32-g++ -+FC= -+AS=i686-w64-mingw32-as - - # Macros - CND_PLATFORM=Cygwin-Windows -@@ -45,8 +45,8 @@ OBJECTFILES= \ - CFLAGS= - - # CC Compiler Flags --CCFLAGS=-m32 -mno-cygwin --CXXFLAGS=-m32 -mno-cygwin -+CCFLAGS=-m32 -+CXXFLAGS=-m32 - - # Fortran Compiler Flags - FFLAGS= -@@ -68,22 +68,22 @@ LDLIBSOPTIONS=app.res - ${OBJECTDIR}/applauncher.o: applauncher.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} [email protected] -- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF [email protected] -o ${OBJECTDIR}/applauncher.o applauncher.cpp -+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/applauncher.o applauncher.cpp - - ${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp - ${MKDIR} -p ${OBJECTDIR}/_ext/493252820 - ${RM} [email protected] -- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF [email protected] -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp -+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp - - ${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp - ${MKDIR} -p ${OBJECTDIR}/_ext/216238457 - ${RM} [email protected] -- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF [email protected] -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp -+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp - - ${OBJECTDIR}/app.o: app.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} [email protected] -- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF [email protected] -o ${OBJECTDIR}/app.o app.cpp -+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/app.o app.cpp - - # Subprojects - .build-subprojects: -diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk -index e35d1ac..2922e6a 100644 ---- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk -+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk -@@ -13,12 +13,12 @@ CP=cp - GREP=grep - NM=nm - CCADMIN=CCadmin --RANLIB=ranlib --CC=x86_64-w64-mingw32-gcc.exe --CCC=x86_64-w64-mingw32-g++.exe --CXX=x86_64-w64-mingw32-g++.exe --FC=gfortran --AS=as.exe -+RANLIB=x86_64-w64-mingw32-ranlib -+CC=x86_64-w64-mingw32-gcc -+CCC=x86_64-w64-mingw32-g++ -+CXX=x86_64-w64-mingw32-g++ -+FC= -+AS=x86_64-w64-mingw32-as - - # Macros - CND_PLATFORM=Cygwin64-Windows -@@ -45,8 +45,8 @@ OBJECTFILES= \ - CFLAGS= - - # CC Compiler Flags --CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++ --CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++ -+CCFLAGS=-m64 -static-libgcc -static-libstdc++ -+CXXFLAGS=-m64 -static-libgcc -static-libstdc++ - - # Fortran Compiler Flags - FFLAGS= -diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp -index 97c15ba..a1a5967 100644 ---- a/ide/launcher/windows/nblauncher.cpp -+++ b/ide/launcher/windows/nblauncher.cpp -@@ -53,6 +53,7 @@ - #include "../../../o.n.bootstrap/launcher/windows/utilsfuncs.h" - #include "../../../o.n.bootstrap/launcher/windows/argnames.h" - #include "../../../o.n.bootstrap/launcher/windows/nbexecloader.h" -+#include <stdio.h> - - using namespace std; - -diff --git a/o.n.bootstrap/launcher/windows/Makefile b/o.n.bootstrap/launcher/windows/Makefile -index 990aafa..2f78df1 100644 ---- a/o.n.bootstrap/launcher/windows/Makefile -+++ b/o.n.bootstrap/launcher/windows/Makefile -@@ -15,7 +15,7 @@ - MKDIR=mkdir - CP=cp - CCADMIN=CCadmin --RANLIB=ranlib -+RANLIB=i686-w64-mingw32-ranlib - - - -@@ -26,16 +26,12 @@ build: .build-post-$(CONF) - # Add your pre 'build' code here... - - .build-post-nbexec: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc -- windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res -- g++ -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe -- cp nbexec.exe ../../../nbbuild/netbeans/platform/lib/ -- cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/ -- -+ i686-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe.res -+ i686-w64-mingw32-g++ -s -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe -+ - .build-post-nbexec64: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc -- x86_64-w64-mingw32-windres.exe -Ocoff nbexec_exe.rc nbexec_exe64.res -- x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe -- cp nbexec64.exe ../../../nbbuild/netbeans/platform/lib/ -- cp nbexec64.dll ../../../nbbuild/netbeans/platform/lib/ -+ x86_64-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe64.res -+ x86_64-w64-mingw32-g++ -m64 -s -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe - - - -@@ -46,7 +42,7 @@ clean: .clean-post-$(CONF) - # Add your pre 'clean' code here... - - .clean-post-nbexec: .clean-impl -- rm -f nbexec_exe32.res nbexec32.exe -+ rm -f nbexec_exe32.res nbexec.exe - - .clean-post-nbexec64: .clean-impl - rm -f nbexec_exe64.res nbexec64.exe -diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk -index 3ae2f5c..961e7dc 100644 ---- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk -+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk -@@ -13,12 +13,12 @@ CP=cp - GREP=grep - NM=nm - CCADMIN=CCadmin --RANLIB=ranlib --CC=gcc --CCC=g++ --CXX=g++ --FC=gfortran --AS=as -+RANLIB=i686-w64-mingw32-ranlib -+CC= -+CCC=i686-w64-mingw32-g++ -+CXX=i686-w64-mingw32-g++ -+FC= -+AS=i686-w64-mingw32-as - - # Macros - CND_PLATFORM=Cygwin-Windows -@@ -46,8 +46,8 @@ OBJECTFILES= \ - CFLAGS= - - # CC Compiler Flags --CCFLAGS=-m32 -mno-cygwin --CXXFLAGS=-m32 -mno-cygwin -+CCFLAGS=-m32 -+CXXFLAGS=-m32 - - # Fortran Compiler Flags - FFLAGS= -@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec.res - nbexec.dll: ${OBJECTDIR}/nbexec.res - - nbexec.dll: ${OBJECTFILES} -- ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mno-cygwin -shared -+ ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -shared - - ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp - - ${OBJECTDIR}/nbexec.o: nbexec.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/nbexec.o nbexec.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/nbexec.o nbexec.cpp - - ${OBJECTDIR}/nbexec.res: nbexec.rc version.h - ${MKDIR} -p ${OBJECTDIR} - @echo Compiling Resource files... -- windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res -+ i686-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res - - : nbexec_exe.rc - @echo -@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec.res: nbexec.rc version.h - ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp - - ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp - - ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp - - # Subprojects - .build-subprojects: -diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk -index 15ed384..485127e 100644 ---- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk -+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk -@@ -13,12 +13,12 @@ CP=cp - GREP=grep - NM=nm - CCADMIN=CCadmin --RANLIB=ranlib --CC=x86_64-w64-mingw32-gcc -+RANLIB=x86_64-w64-mingw32-ranlib -+CC= - CCC=x86_64-w64-mingw32-g++ - CXX=x86_64-w64-mingw32-g++ --FC=gfortran --AS=as -+FC= -+AS=x86_64-w64-mingw32-as - - # Macros - CND_PLATFORM=Cygwin64-Windows -@@ -46,8 +46,8 @@ OBJECTFILES= \ - CFLAGS= - - # CC Compiler Flags --CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++ --CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++ -+CCFLAGS=-m64 -static-libgcc -static-libstdc++ -+CXXFLAGS=-m64 -static-libgcc -static-libstdc++ - - # Fortran Compiler Flags - FFLAGS= -@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec64.res - nbexec64.dll: ${OBJECTDIR}/nbexec64.res - - nbexec64.dll: ${OBJECTFILES} -- ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -mno-cygwin -shared -+ ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -shared - - ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp - - ${OBJECTDIR}/nbexec.o: nbexec.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/nbexec.o nbexec.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/nbexec.o nbexec.cpp - - ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h - ${MKDIR} -p ${OBJECTDIR} - @echo Compiling Resource files... -- x86_64-w64-mingw32-windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res -+ x86_64-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res - - : nbexec_exe.rc - @echo -@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h - ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp - - ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp - - ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp - ${MKDIR} -p ${OBJECTDIR} - ${RM} "[email protected]" -- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "[email protected]" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp -+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF [email protected] -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp - - # Subprojects - .build-subprojects: -diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp -index 21f947f..0193220 100644 ---- a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp -+++ b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp -@@ -52,6 +52,7 @@ - #include "argnames.h" - #include <tlhelp32.h> - #include <windows.h> -+#include <stdio.h> - - using namespace std; - diff --git a/debian/patches/series b/debian/patches/series index d3b52ba..173c27a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ netbeans-platform-nbi.patch netbeans-platform-nojnabinaries.patch -netbeans-platform-windowslauncher.patch netbeans-platform-properties.patch osgi-update.patch netbeans-platform-jemmy.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
