1.1 --- a/makefiles/BuildNashorn.gmk Mon Jul 08 16:33:50 2013 +0530
1.2 +++ b/makefiles/BuildNashorn.gmk Mon Jul 08 18:36:10 2013 +0530
1.3 @@ -71,7 +71,6 @@
1.4 $(BUILD_NASGEN): $(BUILD_NASHORN)
1.5
1.6 # Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package
1.7 -# Finally rename classes in jdk.nashorn.internal.objects package
1.8 $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
1.9 $(ECHO) Running nasgen
1.10 $(MKDIR) -p $(@D)
1.11 @@ -80,9 +79,6 @@
1.12 $(FIXPATH) $(JAVA) \
1.13 -cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
1.14 jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
1.15 - for f in `$(FIND) $(@D)/jdk/nashorn/internal/objects/ -name "*.class"`; do \
1.16 - mv "$$f" `$(ECHO) "$$f" | $(SED) "s/\.class$$/\.clazz/"`; \
1.17 - done
1.18 $(TOUCH) $@
1.19
1.20 # Version file needs to be processed with version numbers
1.21 @@ -104,7 +100,7 @@
1.22 $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \
1.23 $(VERSION_FILE),\
1.24 SRCS:=$(NASHORN_OUTPUTDIR)/classes,\
1.25 - SUFFIXES:=.class .clazz .js .properties Factory,\
1.26 + SUFFIXES:=.class .js .properties Factory,\
1.27 MANIFEST:=$(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF,\
1.28 EXTRA_MANIFEST_ATTR:=$(MANIFEST_ATTRIBUTES),\
1.29 SKIP_METAINF:=true,\
