--- a/make/Makefile	Mon Jan 28 21:29:05 2013 +0530
+++ b/make/Makefile	Mon Jan 28 16:22:03 2013 -0400
@@ -185,6 +185,7 @@
 
 # Standard make clobber target
 clobber: clean
+    $(ECHO) "Cleaning Nashorn! #1"
 
 # All ant targets of interest
 ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel octane sunspider perf alltests

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/makefiles/BuildNashorn.gmk	Mon Jan 28 16:22:03 2013 -0400
@@ -0,0 +1,121 @@
+#
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This must be the first rule
+default: all
+
+-include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+# TODO: build-infra, move this to SPEC
+JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+
+JDK_CLASSES := $(JDK_OUTPUTDIR)/classes
+# TODO: Remove dependency?
+DYNALINK_JAR := $(NASHORN_TOPDIR)/build/dynalink/dynalink.jar
+
+NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar
+NASHORN_VERSION := 0.1
+
+# Need to use source and target 7 for nasgen to work.
+$(eval $(call SetupJavaCompiler,COMPILER_SETUP,\
+    JVM:=$(JAVA),\
+    JAVAC:=$(JAVAC_JARS),\
+    FLAGS:=-g -source 7 -target 7 -bootclasspath $(JDK_CLASSES),\
+    SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+    SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
+
+# Build nashorn into intermediate directory
+$(eval $(call SetupJavaCompilation,BUILD_NASHORN,\
+    SETUP:=COMPILER_SETUP,\
+    SRC:=$(NASHORN_TOPDIR)/src,\
+    COPY:=.properties .js,\
+    BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes,\
+    ADD_JAVAC_FLAGS:=-cp $(DYNALINK_JAR)))
+
+# Build nasgen
+$(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
+    SETUP:=COMPILER_SETUP,\
+    SRC:=$(NASHORN_TOPDIR)/buildtools/nasgen/src,\
+    BIN:=$(NASHORN_OUTPUTDIR)/nasgen_classes,\
+    ADD_JAVAC_FLAGS:=-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
+
+# Nasgen needs nashorn classes
+$(BUILD_NASGEN): $(BUILD_NASHORN)
+
+# Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package
+# Finally rename classes in jdk.nashorn.internal.objects package
+$(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
+	$(ECHO) Running nasgen
+	$(MKDIR) -p $(@D)
+	$(RM) -rf $(@D)/jdk $(@D)/netscape
+	$(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
+	$(JDK_OUTPUTDIR)/bin/java \
+		-cp $(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes \
+		jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
+	for f in `$(FIND) $(@D)/jdk/nashorn/internal/objects/ -name "*.class"`; do \
+	  mv "$$f" `$(ECHO) "$$f" | $(SED) "s/\.class$$/\.clazz/"`; \
+        done
+	$(TOUCH) $@
+
+# Unpack dynalink.jar for inclusion in nashorn.jar
+$(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked: $(DYNALINK_JAR)
+	$(ECHO) Unpacking dynalink.jar
+	$(MKDIR) -p $(@D)
+	$(RM) -rf $(@D)/org
+	$(UNZIP) -q $(DYNALINK_JAR) -x "META-INF*" -d $(@D)
+	$(TOUCH) $@
+
+# Version file needs to be processed with version numbers
+VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
+# Needs to happen after nasgen run since nasgen run deletes it
+$(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run
+$(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template
+	$(ECHO) Creating version.properties
+	$(MKDIR) -p $(@D)
+	$(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_VERSION)/g' \
+		-e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \
+		-e '/^#.*$$/d' -e '/^$$/d'  > $@
+
+
+MANIFEST_ATTRIBUTES:=Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_VERSION)
+
+# Create nashorn.jar from the final classes dir
+$(eval $(call SetupArchive,BUILD_NASHORN_JAR,\
+    $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \
+    $(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked \
+    $(VERSION_FILE),\
+    SRCS:=$(NASHORN_OUTPUTDIR)/classes,\
+    SUFFIXES:=.class .clazz .js .properties Factory,\
+    MANIFEST:=$(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF,\
+    EXTRA_MANIFEST_ATTR:=$(MANIFEST_ATTRIBUTES),\
+    SKIP_METAINF:=true,\
+    JAR:=$(NASHORN_JAR)))
+
+all: $(NASHORN_JAR)
+
+.PHONY: all

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/makefiles/Makefile	Mon Jan 28 16:22:03 2013 -0400
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+    makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+    makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path))
+
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name:=$(notdir $(repo_dir))
+
+# Try to locate top-level makefile
+top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
+ifneq ($(wildcard $(top_level_makefile)),)
+  $(info Will run $(subsystem_name) target on top-level Makefile)
+  $(info WARNING: This is a non-recommended way of building!)
+  $(info ===================================================)
+else
+  $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+  $(error Build from top-level Makefile instead)
+endif
+
+all:
+	@$(MAKE) -f $(top_level_makefile) $(subsystem_name)