Commit ef0ea531 authored by Vincent Privat's avatar Vincent Privat
Browse files

Fix build with Java 9

parent ee5e8bcf

debian/control

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Priority: extra 
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>

Uploaders: Matthias Klose <doko@ubuntu.com>

Build-Depends: debhelper (>= 5), dh-autoreconf, bc,

 npapi-sdk-dev, openjdk-8-jdk, zip, lsb-release, libgtk2.0-dev, pkg-config, default-jre-headless

 npapi-sdk-dev, default-jdk, zip, lsb-release, libgtk2.0-dev, pkg-config, default-jre-headless

Standards-Version: 3.9.6

Vcs-Git: https://salsa.debian.org/java-team/icedtea-web.git

Vcs-Browser: https://salsa.debian.org/java-team/icedtea-web

debian/rules

+140 −16
Original line number Diff line number Diff line
@@ -34,8 +34,12 @@ endif 
ifneq (,$(DEB_HOST_MULTIARCH))

  ifneq (,$(filter $(distrel), precise trusty utopic vivid wily wheezy))

    jre_versions += 7

  else

  else ifneq (,$(filter $(distrel), xenial yakkety zesty artful stretch))

    jre_versions += 8

  else ifneq (,$(filter $(distrel), buster))

    jre_versions += 9

  else

    jre_versions += 10

  endif

endif
@@ -64,10 +68,16 @@ else 
    is7_default = yes

    default_version = 7

    default_plugin_version = 7

  else ifneq (,$(filter $(distrel), sid stretch xenial))

  else ifneq (,$(filter $(distrel), stretch xenial yakkety zesty artful))

    is8_default = yes

    default_version = 8

    default_plugin_version = 8

  else ifneq (,$(filter $(distrel), buster))

    is9_default = yes

    default_version = 9

  else

    is10_default = yes

    default_version = 10

  endif

endif
@@ -83,6 +93,8 @@ ifneq (,$(DEB_HOST_MULTIARCH)) 
  jdk6_home = $(TOP)/java-6-openjdk-$(DEB_HOST_ARCH)

  jdk7_home = $(TOP)/java-7-openjdk-$(DEB_HOST_ARCH)

  jdk8_home = $(TOP)/java-8-openjdk-$(DEB_HOST_ARCH)

  jdk9_home = $(TOP)/java-9-openjdk-$(DEB_HOST_ARCH)

  jdk10_home = $(TOP)/java-10-openjdk-$(DEB_HOST_ARCH)

else

  jdk6_home = $(TOP)/java-6-openjdk

  jdk7_home = $(TOP)/java-7-openjdk
@@ -90,6 +102,8 @@ endif 
base6dir = $(jdk6_home)

base7dir = $(jdk7_home)

base8dir = $(jdk8_home)

base9dir = $(jdk9_home)

base10dir = $(jdk10_home)

vendor = IcedTea

shortver = 6

last_npp_version = 6b18~pre2-2
@@ -99,13 +113,23 @@ priority7 = $(if $(filter yes, $(is7_default)),1071,1060) 
plugin_name = IcedTeaPlugin.so

# not yet higher than for 7

priority8 = $(if $(filter yes, $(is8_default)),1081,1070)

# not yet higher than for 8

priority9 = $(if $(filter yes, $(is9_default)),1091,1080)

# not yet higher than for 9

priority10 = $(if $(filter yes, $(is10_default)),1101,1090)



ifneq (,$(filter $(DEB_HOST_ARCH), alpha hppa sparc64)$(filter $(distrel), dapper))

  with_plugin_pkg = no

else ifneq (,$(filter $(DEB_HOST_ARCH)-$(distrel), sparc-hardy sparc-jaunty))

  with_plugin_pkg = no

else

else ifeq ($(is6_default),yes)

  with_plugin_pkg = yes

else ifeq ($(is7_default),yes)

  with_plugin_pkg = yes

else ifeq ($(is8_default),yes)

  with_plugin_pkg = yes

else

  with_plugin_pkg = no

endif



ifeq ($(distribution),Debian)
@@ -137,24 +161,33 @@ else 
endif





ifeq ($(is7_default),yes)

ifeq ($(is6_default),yes)

  bd_openjdk = openjdk-6-jdk (>= 6b23~pre10~),

  jdk_default_home = $(jdk6_home)

else ifeq ($(is7_default),yes)

  bd_openjdk = openjdk-7-jdk,

  jdk_default_home = $(jdk7_home)

else ifeq ($(is8_default),yes)

  bd_openjdk = openjdk-8-jdk,

  jdk_default_home = $(jdk8_home)

else ifeq ($(is9_default),yes)

  bd_openjdk = openjdk-9-jdk,

  jdk_default_home = $(jdk9_home)

else

  bd_openjdk = openjdk-6-jdk (>= 6b23~pre10~),

  jdk_default_home = $(jdk6_home)

  bd_openjdk = openjdk-10-jdk,

  jdk_default_home = $(jdk10_home)

endif



ifeq ($(default_plugin_version),8)

  netx_depends = openjdk-8-jre | openjdk-7-jre

  netx_depends = openjdk-8-jre

ifeq ($(default_plugin_version),6)

  netx_depends = openjdk-6-jre (>= 6b23~pre10~) | openjdk-7-jre

else ifeq ($(default_plugin_version),7)

  netx_depends = openjdk-7-jre | openjdk-6-jre (>= 6b23~pre10~)

else ifeq ($(default_plugin_version),8)

  netx_depends = openjdk-8-jre

else ifeq ($(default_plugin_version),9)

  netx_depends = openjdk-9-jre | openjdk-8-jre

else

  netx_depends = openjdk-6-jre (>= 6b23~pre10~) | openjdk-7-jre

  netx_depends = openjdk-10-jre | openjdk-9-jre | openjdk-8-jre

endif



ifneq (,$(DEB_HOST_MULTIARCH))
@@ -175,6 +208,8 @@ endif 
java6_launcher = /$(base6dir)/bin/java

java7_launcher = /$(base7dir)/bin/java

java8_launcher = /$(base8dir)/bin/java

java9_launcher = /$(base9dir)/bin/java

java10_launcher = /$(base10dir)/bin/java

ifeq ($(distribution),Ubuntu)

  ifeq (,$(filter $(distrel),karmic jaunty intrepid hardy gutsy feisty edgy dapper))

    java_launcher = cautious-launcher %f /$(basedir)/bin/java
@@ -193,7 +228,7 @@ CONFIGURE_ARGS = \ 
	--disable-docs



ifneq ($(with_plugin_pkg),yes)

  CONFIGURE_ARGS += --disable-plugin

  CONFIGURE_ARGS += --disable-pluginjar --disable-native_plugin

endif



p_netx = icedtea-netx
@@ -249,6 +284,8 @@ packaging-files: 
	      -e 's,@base6dir@,$(base6dir),g' \

	      -e 's,@base7dir@,$(base7dir),g' \

	      -e 's,@base8dir@,$(base8dir),g' \

	      -e 's,@base9dir@,$(base9dir),g' \

	      -e 's,@base10dir@,$(base10dir),g' \

	      -e 's/@srcname@/$(srcname)/g' \

	      -e 's/@jvmarch@/$(jvmarch)/g' \

	      -e 's/@archdir@/$(archdir)/g' \
@@ -256,6 +293,8 @@ packaging-files: 
	      -e 's/@priority6@/$(priority6)/g' \

	      -e 's/@priority7@/$(priority7)/g' \

	      -e 's/@priority8@/$(priority8)/g' \

	      -e 's/@priority9@/$(priority9)/g' \

	      -e 's/@priority10@/$(priority10)/g' \

	      -e 's/@mantag@/$(mantag)/g' \

	      -e 's/@multiarch@/$(DEB_HOST_MULTIARCH)/g' \

	      -e 's,@plugin_name@,$(plugin_name),g' \
@@ -267,6 +306,8 @@ packaging-files: 
	      -e 's,@java_launcher@,$(java_launcher),g' \

	      -e 's,@java7_launcher@,$(java7_launcher),g' \

	      -e 's,@java8_launcher@,$(java8_launcher),g' \

	      -e 's,@java9_launcher@,$(java9_launcher),g' \

	      -e 's,@java10_launcher@,$(java10_launcher),g' \

	    $$f > $$f2; \

	done
@@ -296,11 +337,26 @@ configure8-stamp: autoreconf-stamp 
	cd build8 \

	  && $(buildflags) ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_default_home)

	touch $@

configure9-stamp: autoreconf-stamp

	dh_testdir

	rm -rf build9

	mkdir -p build9/completion

	cd build9 \

	  && $(buildflags) ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_default_home)

	touch $@

configure10-stamp: autoreconf-stamp

	dh_testdir

	rm -rf build10

	mkdir -p build10/completion

	cd build10 \

	  && $(buildflags) ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_default_home)

	touch $@



build-arch: build

build-indep: build

build: $(if $(filter 6,$(jre_versions)),build6-stamp) \

  $(if $(filter 7,$(jre_versions)),build7-stamp) $(if $(filter 8,$(jre_versions)),build8-stamp)

  $(if $(filter 7,$(jre_versions)),build7-stamp) $(if $(filter 8,$(jre_versions)),build8-stamp) \

  $(if $(filter 9,$(jre_versions)),build9-stamp) $(if $(filter 10,$(jre_versions)),build10-stamp)

build6-stamp: configure6-stamp

	dh_testdir

	$(MAKE) -C build VERSION_DEFS='-DICEDTEA_WEB_JRE="\"/$(jdk6_home)\""'
@@ -313,12 +369,20 @@ build8-stamp: configure8-stamp 
	dh_testdir

	$(MAKE) -C build8 VERSION_DEFS='-DHAVE_JAVA8 -DICEDTEA_WEB_JRE="\"/$(jdk8_home)\""'

	touch $@

build9-stamp: configure9-stamp

	dh_testdir

	$(MAKE) -C build9 VERSION_DEFS='-DHAVE_JAVA9 -DICEDTEA_WEB_JRE="\"/$(jdk9_home)\""'

	touch $@

build10-stamp: configure10-stamp

	dh_testdir

	$(MAKE) -C build10 VERSION_DEFS='-DHAVE_JAVA9 -DICEDTEA_WEB_JRE="\"/$(jdk10_home)\""'

	touch $@



clean:

	dh_testdir

	dh_testroot

	rm -f *-stamp

	rm -rf build6 build7 build8

	rm -rf build6 build7 build8 build9 build10

	for f in debian/*.in; do \

	  case "$$f" in \

	    debian/PLUGIN.*.in) f2=$$(echo $$f | sed 's/PLUGIN/$(p_plug6)/;s/\.in$$//');; \
@@ -329,7 +393,7 @@ clean: 
	  case "$$f2" in debian/control) continue; esac; \

	  rm -f $$f2; \

	done

	rm -rf debian/tmp6 debian/tmp7 debian/tmp8

	rm -rf debian/tmp6 debian/tmp7 debian/tmp8 debian/tmp9 debian/tmp10

	dh_autoreconf_clean

	dh_clean
@@ -359,6 +423,20 @@ ifneq (,$(filter 8, $(jre_versions))) 
		$(jdk8_home)/jre/bin \

		$(jdk8_home)/jre/man/man1

endif

ifneq (,$(filter 9, $(jre_versions)))

	dh_installdirs -p$(p_netx) \

		$(jdk9_home)/bin \

		$(jdk9_home)/man/man1 \

		$(jdk9_home)/jre/bin \

		$(jdk9_home)/jre/man/man1

endif

ifneq (,$(filter 10, $(jre_versions)))

	dh_installdirs -p$(p_netx) \

		$(jdk10_home)/bin \

		$(jdk10_home)/man/man1 \

		$(jdk10_home)/jre/bin \

		$(jdk10_home)/jre/man/man1

endif

ifneq (,$(DEB_HOST_MULTIARCH))

	dh_installdirs -p$(p_comm) \

		usr/share/applications \
@@ -396,7 +474,21 @@ ifneq (,$(filter 8, $(jre_versions))) 
	$(MAKE) -C build8 install DESTDIR=$(CURDIR)/debian/tmp8

	sed -i 's/java-[67]-openjdk/java-8-openjdk/g' debian/tmp8/usr/bin/*

endif

	tar -C debian/tmp$(default_plugin_version) -c -f - . | tar -C $(d_netx) -x -f -

ifneq (,$(filter 9, $(jre_versions)))

	dh_installdirs \

		$(jdk9_home)/jre/lib/$(archdir) \

		usr/share/icedtea-web

	$(MAKE) -C build9 install DESTDIR=$(CURDIR)/debian/tmp9

	sed -i 's/java-[678]-openjdk/java-9-openjdk/g' debian/tmp9/usr/bin/*

endif

ifneq (,$(filter 10, $(jre_versions)))

	dh_installdirs \

		$(jdk10_home)/jre/lib/$(archdir) \

		usr/share/icedtea-web

	$(MAKE) -C build10 install DESTDIR=$(CURDIR)/debian/tmp10

	sed -i 's/java-[6789]-openjdk/java-10-openjdk/g' debian/tmp10/usr/bin/*

endif

	tar -C debian/tmp$(default_version) -c -f - . | tar -C $(d_netx) -x -f -

	rm -f $(d_netx)/usr/lib/IcedTeaPlugin.so

	rm -rf $(d_netx)/usr/bin

	rm -rf $(d_netx)/usr/share/man
@@ -429,9 +521,21 @@ ifneq (,$(filter 8, $(jre_versions))) 
	mv debian/tmp8/usr/lib/IcedTeaPlugin.so \

		$(d_plug8)/$(jdk8_home)/jre/lib/$(archdir)/

endif

ifneq (,$(filter 9, $(jre_versions)))

	for t in javaws itweb-settings policyeditor; do \

	  mv debian/tmp9/usr/bin/$$t $(d_netx)/$(jdk9_home)/jre/bin/; \

	  mv debian/tmp9/usr/share/man/man1/$$t.1 $(d_netx)/$(jdk9_home)/jre/man/man1/; \

	done

endif

ifneq (,$(filter 10, $(jre_versions)))

	for t in javaws itweb-settings policyeditor; do \

	  mv debian/tmp10/usr/bin/$$t $(d_netx)/$(jdk10_home)/jre/bin/; \

	  mv debian/tmp10/usr/share/man/man1/$$t.1 $(d_netx)/$(jdk10_home)/jre/man/man1/; \

	done

endif



	# compress manpages

	find $(d_netx)/$(jdk6_home)/jre/man/man1/ $(d_netx)/$(jdk7_home)/jre/man/man1/ $(d_netx)/$(jdk8_home)/jre/man/man1/ -type f ! -type l | xargs gzip -9v -n

	find $(d_netx)/$(jdk6_home)/jre/man/man1/ $(d_netx)/$(jdk7_home)/jre/man/man1/ $(d_netx)/$(jdk8_home)/jre/man/man1/ $(d_netx)/$(jdk9_home)/jre/man/man1/ $(d_netx)/$(jdk10_home)/jre/man/man1/ -type f ! -type l | xargs gzip -9v -n



ifneq (,$(filter 6, $(jre_versions)))

	dh_link -p$(p_netx) \
@@ -462,6 +566,26 @@ ifneq (,$(filter 8, $(jre_versions))) 
          /$(jdk8_home)/jre/man/man1/itweb-settings.1.gz /$(jdk8_home)/man/man1/itweb-settings.gz \

	  /$(jdk8_home)/jre/man/man1/policyeditor.1.gz /$(jdk8_home)/man/man1/policyeditor.1.gz

endif

ifneq (,$(filter 9, $(jre_versions)))

	find $(d_netx)/$(jdk9_home)/jre/man/man1/ -type f ! -type l | xargs gzip -9v -n

	dh_link -p$(p_netx) \

	  /$(jdk9_home)/jre/bin/javaws /$(jdk9_home)/bin/javaws \

	  /$(jdk9_home)/jre/bin/itweb-settings /$(jdk9_home)/bin/itweb-settings \

	  /$(jdk9_home)/jre/bin/policyeditor /$(jdk9_home)/bin/policyeditor \

	  /$(jdk9_home)/jre/man/man1/javaws.1.gz /$(jdk9_home)/man/man1/javaws.1.gz \

	  /$(jdk9_home)/jre/man/man1/itweb-settings.1.gz /$(jdk9_home)/man/man1/itweb-settings.gz \

	  /$(jdk9_home)/jre/man/man1/policyeditor.1.gz /$(jdk9_home)/man/man1/policyeditor.1.gz

endif

ifneq (,$(filter 10, $(jre_versions)))

	find $(d_netx)/$(jdk10_home)/jre/man/man1/ -type f ! -type l | xargs gzip -9v -n

	dh_link -p$(p_netx) \

	  /$(jdk10_home)/jre/bin/javaws /$(jdk10_home)/bin/javaws \

	  /$(jdk10_home)/jre/bin/itweb-settings /$(jdk10_home)/bin/itweb-settings \

	  /$(jdk10_home)/jre/bin/policyeditor /$(jdk10_home)/bin/policyeditor \

	  /$(jdk10_home)/jre/man/man1/javaws.1.gz /$(jdk10_home)/man/man1/javaws.1.gz \

	  /$(jdk10_home)/jre/man/man1/itweb-settings.1.gz /$(jdk10_home)/man/man1/itweb-settings.gz \

	  /$(jdk10_home)/jre/man/man1/policyeditor.1.gz /$(jdk10_home)/man/man1/policyeditor.1.gz

endif



ifneq (,$(DEB_HOST_MULTIARCH))

	mv $(d_netx)/usr/share/icedtea-web $(d_comm)/usr/share/