Please review this minor fix for jdk demos MoleculeViewer and WireFrameTest. In JDK-8020060, these were changed to build differently. This had the side effect of putting the source files in a src.zip. It seems that the fixer made an effort to still copy some source files into the demo dir to retain some of the old file layout, but not all the source files were included. This fix changes that so that all source files are included like before.

Posting inline since it's small and cr.openjdk.java.net is down atm.

diff -r f26a0c8071bd makefiles/CompileDemos.gmk
--- a/makefiles/CompileDemos.gmk
+++ b/makefiles/CompileDemos.gmk
@@ -157,8 +157,8 @@

 BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services

-$(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html XYZApp.java)) -$(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html ThreeD.java)) +$(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html *.java))
+$(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html *.java))
 $(eval $(call SetupDemo,FileChooserDemo,jfc,,FileChooserDemo,,,README*))
 $(eval $(call SetupDemo,Font2DTest,jfc,,Font2DTest,,,*.html *.txt))
 $(eval $(call SetupDemo,Metalworks,jfc,,Metalworks,,,README*))


/Erik

Reply via email to