components/runtime/openjdk-8/patches/0040-patch-jdk_make_CompileDemos.gmk.patch

   1 $NetBSD: patch-jdk_make_CompileDemos.gmk,v 1.1 2015/07/03 20:40:59 fhajny Exp $
   2
   3 --- jdk/make/CompileDemos.gmk.orig
   4 +++ jdk/make/CompileDemos.gmk
   5 @@ -56,7 +56,6 @@
   6        BUILD_DEMOS += $$(BUILD_DEMO_APPLET_$1)
   7  endef
   8
   9 -ifneq ($(OPENJDK_TARGET_OS), solaris)
  10    $(eval $(call SetupAppletDemo,ArcTest))
  11    $(eval $(call SetupAppletDemo,BarChart))
  12    $(eval $(call SetupAppletDemo,Blink))
  13 @@ -77,7 +76,6 @@
  14      $(eval $(call SetupAppletDemo,JumpingBox,,closed/))
  15      $(eval $(call SetupAppletDemo,TicTacToe,,closed/))
  16    endif
  17 -endif
  18
  19  ##################################################################################################
  20
  21 @@ -159,11 +157,9 @@
  22
  23  BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services
  24
  25 -ifneq ($(OPENJDK_TARGET_OS), solaris)
  26    $(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html *.java))
  27    $(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html *.java))
  28    $(eval $(call SetupDemo,SwingApplet,jfc,,SwingApplet,,,README* *.html))
  29 -endif
  30  $(eval $(call SetupDemo,FileChooserDemo,jfc,,FileChooserDemo,,,README*))
  31  $(eval $(call SetupDemo,Font2DTest,jfc,,Font2DTest,,,*.html *.txt))
  32  $(eval $(call SetupDemo,Metalworks,jfc,,Metalworks,,,README*))
  33 @@ -375,16 +371,9 @@
  34  ##################################################################################################
  35
  36  # The netbeans project files are copied into the demo directory.
  37 -ifeq ($(OPENJDK_TARGET_OS), solaris)
  38 -  BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \
  39 -    $(JDK_OUTPUTDIR)/demo/nbproject/%, \
  40 -    $(filter-out $(JDK_TOPDIR)/src/share/demo/nbproject/jfc/SwingApplet%, \
  41 -    $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject)))
  42 -else
  43    BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \
  44      $(JDK_OUTPUTDIR)/demo/nbproject/%, \
  45      $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject))
  46 -endif
  47
  48  $(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/share/demo/nbproject/%
  49         $(call install-file)