[libnb-platform-java] 12/22: Stop building the windows launcher.

Markus Koschany apo at moszumanska.debian.org
Sat Oct 29 13:12:25 UTC 2016


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

apo pushed a commit to branch master
in repository libnb-platform-java.

commit 1d54870b64d97409772ad046a545aa7bf1a3e1e6
Author: Markus Koschany <apo at debian.org>
Date:   Thu Oct 27 20:06:50 2016 +0200

    Stop building the windows launcher.
    
    Requires too much maintenance work and Makefile-Impl.mk which does not
    even exist. I think the windows launcher is also rather optional on Linux.
---
 debian/control |  2 --
 debian/rules   | 13 -------------
 2 files changed, 15 deletions(-)

diff --git a/debian/control b/debian/control
index d7e7349..8a0d805 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,6 @@ Build-Depends:
  antlr3 (>= 3.4),
  debhelper (>= 9),
  default-jdk,
- g++-mingw-w64-i686,
- g++-mingw-w64-x86-64,
  javacc,
  javahelp2,
  javahelper,
diff --git a/debian/rules b/debian/rules
index 00d5f21..2285c17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,14 +56,6 @@ override_dh_auto_build:
 	ln -sf /usr/share/xml/w3c-sgml-lib/schema/dtd/REC-xhtml-modularization-20100729/xhtml* nbbuild/external/xhtml1-dtds
 	# link Debian's system jars
 	$(shell awk 'NF==4 {printf("ln -sf %s %s/%s;\n",$$1,$$2,$$4)}' debian/linked-jars)
-	################################################################
-	# Build the Windows launcher
-	mkdir -p nbbuild/netbeans/platform/lib
-	cd o.n.bootstrap/launcher/windows && LDFLAGS="" CONF="nbexec" make -e
-	cd o.n.bootstrap/launcher/windows && LDFLAGS="" CONF="nbexec64" make -e
-	cd apisupport.harness/windows-launcher-src && LDFLAGS="" CONF="app.exe" make -e
-	cd apisupport.harness/windows-launcher-src && LDFLAGS="" CONF="app64.exe" make -e
-	################################################################
 	# Build the platform. DISPLAY must be unset to avoid build failures.
 	unset DISPLAY; ant \
 	-Dbuildstamp=$(BUILDSTAMP) \
@@ -144,16 +136,11 @@ override_dh_auto_clean:
 	$(call symlink, $(JAVADIR)/$(JH_JAR), javahelp/external/$(NB_JH_JAR))
 	$(call symlink, $(JAVADIR)/$(JSEARCH_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
 	ant -Dpermit.jdk8.builds=true -f nbbuild/build.xml clean
-	cd o.n.bootstrap/launcher/windows && CONF="nbexec" make -e clean
-	cd o.n.bootstrap/launcher/windows && CONF="nbexec64" make -e clean
-	cd apisupport.harness/windows-launcher-src && CONF="app.exe" make -e clean
-	cd apisupport.harness/windows-launcher-src && CONF="app64.exe" make -e clean
 	mh_clean
 	# remove all the symlinks to jar files we created
 	find . -name "*.jar" -type l -delete
 	$(RM) -r nbbuild/external/xhtml1-dtds
 	$(RM) nbbuild/nbproject/private/scan-cache-standard.ser
-	$(RM) o.n.bootstrap/launcher/windows/nbexec_exe.res
 
 override_jh_depends:
 	# Skipping jh_depends run - since we use symlinks to /usr/share/java then

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



More information about the pkg-java-commits mailing list