On 11/6/2013 7:29 PM, Erik Joelsson wrote:
On 2013-11-06 15:37, Alexander Scherbatiy wrote:
On 11/6/2013 3:15 PM, Erik Joelsson wrote:
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.
Will all source file be placed only in zip file or they also be
located in the file system as it was before the previous fix?
Both in the zip file and in the file system with this fix.
The fix looks good for me.
Could you upload the webrev to the http://cr.openjdk.java.net ? It
should work now.
Thanks,
Alexandr.
/Erik
Thanks,
Alexandr.
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