[netbeans] 02/02: Removed the obsolete -mno-cygwin flag to build the Windows launcher with mingw32 4.9

Sun Aug 17 01:19:33 UTC 2014

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netbeans.

commit a7d928abe7b8a68297bdf06ad2253f463ccd1620
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Aug 17 03:18:53 2014 +0200

    Removed the obsolete -mno-cygwin flag to build the Windows launcher with mingw32 4.9
---
 debian/changelog                                   |  2 +
 .../netbeans-platform~windowslauncher.patch        | 73 +++++++++++++++-------
 2 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d9e61e..85ef2ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ netbeans (7.0.1+dfsg1-6) UNRELEASED; urgency=medium
 
   [ Emmanuel Bourg ]
   * Fixed the build failure with Ant 1.9 (Closes: #713182)
+  * Removed the obsolete -mno-cygwin flag to build the Windows launcher
+    with mingw32 4.9
   * Enabled building with Java 7
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
diff --git a/debian/patches/netbeans-platform~windowslauncher.patch b/debian/patches/netbeans-platform~windowslauncher.patch
index f667fb8..b3acbed 100644
--- a/debian/patches/netbeans-platform~windowslauncher.patch
+++ b/debian/patches/netbeans-platform~windowslauncher.patch
@@ -1,10 +1,8 @@
 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.
 
-Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/Makefile	2011-06-13 21:39:36.107758898 +0100
-+++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile	2011-06-14 23:46:57.388989761 +0100
+--- a/o.n.bootstrap/launcher/windows/Makefile
++++ b/o.n.bootstrap/launcher/windows/Makefile
 @@ -34,7 +34,7 @@
  MKDIR=mkdir
  CP=cp
@@ -21,14 +19,12 @@ Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile
 -	windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
 -	g++ -s -mno-cygwin nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
 +	i586-mingw32msvc-windres -Ocoff nbexec_exe.rc nbexec_exe.res
-+	i586-mingw32msvc-g++ -s -mno-cygwin nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
++	i586-mingw32msvc-g++ -s nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
  
  # clean
  clean: .clean-post
-Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk	2011-06-13 21:39:36.137760501 +0100
-+++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk	2011-06-14 23:47:19.998990498 +0100
+--- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
++++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
 @@ -11,12 +11,12 @@
  MKDIR=mkdir
  CP=cp
@@ -47,7 +43,24 @@ Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Ma
  
  # Macros
  CND_PLATFORM=Cygwin-Windows
-@@ -65,22 +65,22 @@
+@@ -41,8 +41,8 @@
+ CFLAGS=-m32
+ 
+ # CC Compiler Flags
+-CCFLAGS=-m32 -s -mno-cygwin
+-CXXFLAGS=-m32 -s -mno-cygwin
++CCFLAGS=-m32 -s
++CXXFLAGS=-m32 -s
+ 
+ # Fortran Compiler Flags
+ FFLAGS=
+@@ -60,27 +60,27 @@
+ nbexec.dll: ${OBJECTDIR}/nbexec.res
+ 
+ nbexec.dll: ${OBJECTFILES}
+-	${LINK.cc} -mno-cygwin -shared -o nbexec.dll -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS} 
++	${LINK.cc} -shared -o nbexec.dll -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS} 
+ 
  ${OBJECTDIR}/platformlauncher.o: nbproject/Makefile-${CND_CONF}.mk platformlauncher.cpp 
  	${MKDIR} -p ${OBJECTDIR}
  	${RM} $@.d
@@ -89,10 +102,8 @@ Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Ma
  
  # Subprojects
  .build-subprojects:
-Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/Makefile
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/apisupport.harness/windows-launcher-src/Makefile	2011-06-14 23:46:57.338990509 +0100
-+++ libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/Makefile	2011-06-14 23:56:49.309005828 +0100
+--- a/apisupport.harness/windows-launcher-src/Makefile
++++ b/apisupport.harness/windows-launcher-src/Makefile
 @@ -34,7 +34,7 @@
  MKDIR=mkdir
  CP=cp
@@ -115,10 +126,8 @@ Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/Mak
  
  .clean-pre:
  # Add your pre 'clean' code here...
-Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk	2011-06-14 23:46:57.358990425 +0100
-+++ libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk	2011-06-14 23:47:19.998990498 +0100
+--- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk
++++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk
 @@ -11,10 +11,10 @@
  MKDIR=mkdir
  CP=cp
@@ -134,6 +143,17 @@ Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/nbp
  FC=
  AS=
  
+@@ -38,8 +38,8 @@
+ CFLAGS=
+ 
+ # CC Compiler Flags
+-CCFLAGS=-m32 -s -mno-cygwin
+-CXXFLAGS=-m32 -s -mno-cygwin
++CCFLAGS=-m32 -s
++CXXFLAGS=-m32 -s
+ 
+ # Fortran Compiler Flags
+ FFLAGS=
 @@ -84,7 +84,7 @@
  # Clean Targets
  .clean-conf:
@@ -143,10 +163,8 @@ Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/nbp
  
  # Subprojects
  .clean-subprojects:
-Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/jvmlauncher.h
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/jvmlauncher.h	2011-06-14 23:46:57.428989809 +0100
-+++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/jvmlauncher.h	2011-06-15 18:56:36.509511571 +0100
+--- a/o.n.bootstrap/launcher/windows/jvmlauncher.h
++++ b/o.n.bootstrap/launcher/windows/jvmlauncher.h
 @@ -50,6 +50,18 @@
  #include <windows.h>
  #include <string>
@@ -166,3 +184,14 @@ Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/jvmlauncher.
  #include "jni.h"
  #include "utilsfuncs.h"
  
+--- a/o.n.bootstrap/launcher/windows/nbproject/configurations.xml
++++ b/o.n.bootstrap/launcher/windows/nbproject/configurations.xml
+@@ -57,7 +57,7 @@
+             <pElem>D:/Program Files/Java/jdk1.6.0_22/include/win32</pElem>
+             <pElem>D:/Program Files/Java/jdk1.6.0_22/include</pElem>
+           </incDir>
+-          <commandLine>-s -mno-cygwin</commandLine>
++          <commandLine>-s</commandLine>
+           <warningLevel>2</warningLevel>
+         </ccTool>
+         <linkerTool>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git

