sproutit-narwhal 0.2.102 → 0.2.106

data/Rakefile

@@ -46,7 +46,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.authors = 'Developed by Tom Robinson and contributors. Gem publish by Charles Jolley'
   gemspec.email = 'contact@sproutcore.com'
   gemspec.homepage = 'http://www.narwhaljs.org'
-  gemspec.summary = "JavaScript Command Line"
+  gemspec.summary = "CommonJS Command Line"
   
   gemspec.add_development_dependency 'extlib', ">= 0.9.9"
   gemspec.add_development_dependency 'gemcutter', ">= 0.1.0"
@@ -55,7 +55,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.rubyforge_project = "sproutit-narwhal"
     
   gemspec.files.include *%w[engines/jsc/**/* extconf.rb]
-  gemspec.files.exclude *%w[.gitignore .gitmodules .DS_Store tmp .hashinfo .svn .git narwhal.conf Makefile]
+  gemspec.files.exclude *%w[.gitignore .gitmodules .DS_Store tmp .hashinfo .svn .git narwhal.conf ./Makefile]
   gemspec.files.exclude *%w[engines/jsc/**/*.dylib engines/jsc/**/*.dylib.dSYM engines/jsc/**/*.so engines/jsc/**/*.dll engines/jsc/**/*.o engines/jsc/**/*.s engines/jsc/**/*.ii engines/jsc/bin/*]
   
   gemspec.description = File.read(ROOT_PATH / 'README.md')

data/VERSION.yml

@@ -1,7 +1,7 @@
 --- 
 :minor: 2
-:patch: 102
-:digest: 5fd28296962dbb5294603e99b60b7b8d42a78248
+:patch: 106
+:digest: 1fb1e1ec39f87eddb09a18304402b7c09f366bbe
 :dist: 
   engines/jsc: 89097446434f3ff6763ad41b02b0ea7b9d5794eb
 :major: 0

data/engines/jsc/Makefile

@@ -0,0 +1,123 @@
+CPP       =g++
+CPPFLAGS   = -0s -force_cpusubtype_ALL -mmacosx-version-min=10.4 -arch i386 -arch ppc
+#CPPFLAGS += -g -O0
+#CPPFLAGS += -DDEBUG_ON
+#CPPFLAGS += -save-temps
+
+FRAMEWORKS_DIR=frameworks
+#FRAMEWORKS=-Fframeworks
+#FRAMEWORKS=-F/Users/tlrobinson/code/WebKit/WebKitBuild/Release/
+
+LIB_DIR   =lib
+
+INCLUDES  =-Iinclude
+MODULES   =$(patsubst %.cc,%.dylib,$(patsubst src/%,lib/%,$(shell find src -name '*.cc')))
+LIBS      =-framework JavaScriptCore -L/usr/lib -lreadline -liconv -L$(LIB_DIR) -lnarwhal $(FRAMEWORKS)
+
+SOURCE    =narwhal-jsc.c
+EXECUTABLE=bin/narwhal-jsc
+
+JSCORE_CONFIG=Production
+JSCORE_FRAMEWORK=$(FRAMEWORKS_DIR)/JavaScriptCore.framework
+JSCORE_BUILD=deps/JavaScriptCore/build/$(JSCORE_CONFIG)/JavaScriptCore.framework
+JSCORE_CHECKOUT=deps/JavaScriptCore
+
+SYSTEM_JSC=/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/JavaScriptCore
+RELATIVE_JSC=@executable_path/../frameworks/JavaScriptCore.framework/JavaScriptCore
+
+ABSOLUTE_LIBNARWHAL=$(LIB_DIR)/libnarwhal.dylib
+RELATIVE_LIBNARWHAL=@executable_path/../lib/libnarwhal.dylib
+
+JSCOCOA_FRAMEWORK=$(FRAMEWORKS_DIR)/JSCocoa.framework
+JSCOCOA_BUILD=deps/JSCocoa/JSCocoa/build/Release/JSCocoa.framework
+JSCOCOA_CHECKOUT=deps/JSCocoa
+
+all: jsc modules rewrite-lib-paths
+jscocoa: frameworks-jscocoa jsc-jscocoa modules rewrite-lib-paths
+webkit: jsc-webkit modules rewrite-lib-paths
+
+lib/libnarwhal.dylib: narwhal.c
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -dynamiclib -o $@ $< $(FRAMEWORKS) -framework JavaScriptCore 
+
+jsc: $(SOURCE) lib/libnarwhal.dylib
+	mkdir -p `dirname $(EXECUTABLE)`
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -o $(EXECUTABLE) $(SOURCE) $(LIBS)
+	install_name_tool -change "$(ABSOLUTE_LIBNARWHAL)" "$(RELATIVE_LIBNARWHAL)" "$(EXECUTABLE)"
+
+jsc-webkit: $(SOURCE) lib/libnarwhal.dylib
+	mkdir -p `dirname $(EXECUTABLE)`
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -DWEBKIT -o $(EXECUTABLE) -x objective-c $(SOURCE) $(LIBS) \
+		-framework WebKit -framework Foundation -ObjC
+	install_name_tool -change "$(ABSOLUTE_LIBNARWHAL)" "$(RELATIVE_LIBNARWHAL)" "$(EXECUTABLE)"
+
+jsc-jscocoa: $(SOURCE) lib/libnarwhal.dylib
+	mkdir -p `dirname $(EXECUTABLE)`
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -DJSCOCOA -o $(EXECUTABLE) -x objective-c $(SOURCE) $(LIBS) \
+		-framework JSCocoa -framework Foundation -ObjC
+	install_name_tool -change "$(ABSOLUTE_LIBNARWHAL)" "$(RELATIVE_LIBNARWHAL)" "$(EXECUTABLE)"
+
+frameworks: $(JSCORE_FRAMEWORK)
+
+frameworks-jscocoa: $(JSCORE_FRAMEWORK) $(JSCOCOA_FRAMEWORK)
+
+modules: $(MODULES)
+
+rewrite-lib-paths:
+	#find lib -name "*.dylib" \! -path "*.dSYM*" -exec install_name_tool -change "$(SYSTEM_JSC)" "$(RELATIVE_JSC)" {} \;
+	find lib -name "*.dylib" \! -path "*.dSYM*" -exec install_name_tool -change "$(ABSOLUTE_LIBNARWHAL)" "$(RELATIVE_LIBNARWHAL)" {} \;
+
+mongoose.o: mongoose.c
+	gcc $(CPPFLAGS) -W -Wall -std=c99 -pedantic -fomit-frame-pointer -c mongoose.c
+
+lib/jack/handler/mongoose.dylib: src/jack/handler/mongoose.cc mongoose.o
+	mkdir -p `dirname $@`
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -dynamiclib -o $@ $< $(LIBS) mongoose.o
+	#install_name_tool -change "$(SYSTEM_JSC)" "$(RELATIVE_JSC)" "$@"
+
+deps/http-parser/http_parser.o:
+	cd deps/http-parser && make http_parser.o
+
+lib/jack/handler/jill.dylib: src/jack/handler/jill.cc deps/http-parser/http_parser.o lib/io-engine.dylib lib/binary-engine.dylib
+	mkdir -p `dirname $@`
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -dynamiclib -o $@ $< $(LIBS) deps/http-parser/http_parser.o lib/io-engine.dylib lib/binary-engine.dylib
+	#install_name_tool -change "$(SYSTEM_JSC)" "$(RELATIVE_JSC)" "$@"
+	install_name_tool -change "lib/io-engine.dylib" "@executable_path/../lib/io-engine.dylib" "$@"
+	install_name_tool -change "lib/binary-engine.dylib" "@executable_path/../lib/binary-engine.dylib" "$@"
+	
+lib/%.dylib: src/%.cc
+	mkdir -p `dirname $@`
+	$(CPP) $(CPPFLAGS) $(INCLUDES) -dynamiclib -o $@ $< $(LIBS)
+	#install_name_tool -change "$(SYSTEM_JSC)" "$(RELATIVE_JSC)" "$@"
+
+$(JSCORE_FRAMEWORK): $(JSCORE_BUILD)
+	mkdir -p `dirname $@`
+	cp -r $< $@
+	install_name_tool -id "@executable_path/../$(FRAMEWORKS_DIR)/JavaScriptCore.framework/JavaScriptCore" $@/JavaScriptCore
+$(JSCORE_BUILD): $(JSCORE_CHECKOUT)
+	cd deps/JavaScriptCore && xcodebuild -target JavaScriptCore -configuration $(JSCORE_CONFIG)
+$(JSCORE_CHECKOUT):
+	mkdir -p `dirname $@`
+	svn checkout http://svn.webkit.org/repository/webkit/trunk/JavaScriptCore $@
+
+$(JSCOCOA_FRAMEWORK): $(JSCOCOA_BUILD)
+	mkdir -p `dirname $@`
+	cp -r $< $@
+	install_name_tool -id "@loader_path/../$(FRAMEWORKS_DIR)/JSCocoa.framework/JSCocoa" "$@/JSCocoa"
+	install_name_tool -change "$(SYSTEM_JSC)" "$(RELATIVE_JSC)" "$@/JSCocoa";
+
+$(JSCOCOA_BUILD): $(JSCOCOA_CHECKOUT)
+	cd $(JSCOCOA_CHECKOUT)/JSCocoa && xcodebuild -project "JSCocoa (embed).xcodeproj"
+$(JSCOCOA_CHECKOUT):
+	mkdir -p `dirname $@`
+	git clone git://github.com/parmanoir/jscocoa.git $@
+
+clean:
+	find lib -name "*.dylib" -exec rm -rf {} \;
+	rm -rf bin/narwhal-jsc* bin/*.dylib bin/*.dSYM lib/*.dylib lib/*.dSYM $(EXECUTABLE) *.o *.ii *.s
+	cd deps/http-parser && make clean
+
+cleaner: clean
+	rm -rf $(JSCORE_FRAMEWORK) $(JSCOCOA_FRAMEWORK) $(JSCORE_BUILD) $(JSCOCOA_BUILD)
+
+pristine: cleaner
+	rm -rf deps

data/engines/jsc/deps/http-parser/Makefile

@@ -0,0 +1,27 @@
+OPT=-O0 -g -Wall -Wextra -force_cpusubtype_ALL -mmacosx-version-min=10.4 -arch i386 -arch ppc #-Werror
+#OPT=-O2
+
+test: http_parser.o test.c
+	gcc $(OPT) http_parser.o test.c -o $@
+
+http_parser.o: http_parser.c http_parser.h Makefile
+	gcc $(OPT) -c http_parser.c
+
+http_parser.c: http_parser.rl Makefile
+	ragel -s -G2 http_parser.rl -o $@
+
+tags: http_parser.rl http_parser.h test.c
+	ctags $^
+
+clean:
+	rm -f *.o http_parser.c test http_parser.tar
+
+package: http_parser.c
+	@rm -rf /tmp/http_parser && mkdir /tmp/http_parser && \
+	cp LICENSE README.md Makefile http_parser.c http_parser.rl \
+		http_parser.h test.c /tmp/http_parser && \
+	cd /tmp && \
+	tar -cf http_parser.tar http_parser/
+	@echo /tmp/http_parser.tar
+
+.PHONY: clean package

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutit-narwhal
 version: !ruby/object:Gem::Version 
-  version: 0.2.102
+  version: 0.2.106
 platform: ruby
 authors: 
 - Developed by Tom Robinson and contributors. Gem publish by Charles Jolley
@@ -162,9 +162,11 @@ files:
 - engines/default/lib/string.js
 - engines/default/lib/system.js
 - engines/default/lib/worker.js
+- engines/jsc/Makefile
 - engines/jsc/README.md
 - engines/jsc/bootstrap.js
 - engines/jsc/deps/http-parser/LICENSE
+- engines/jsc/deps/http-parser/Makefile
 - engines/jsc/deps/http-parser/README.md
 - engines/jsc/deps/http-parser/http_parser.c
 - engines/jsc/deps/http-parser/http_parser.h
@@ -429,6 +431,6 @@ rubyforge_project: sproutit-narwhal
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: JavaScript Command Line
+summary: CommonJS Command Line
 test_files: []