Use osx as the short tag for OS X instead of mac.

diff --git a/.gitignore b/.gitignore
index 6b657996c02e1849e0cfe3c67a6a42679cfb66dc..96b2ad406c3e4dccf9070dfcdc989d4b20f1bf98 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,6 @@ readline-6.2
 readline-6.2.tar.gz
 libffi.*
 build.*
 readline-6.2.tar.gz
 libffi.*
 build.*

-Cycript-ios.framework
-Cycript-mac.framework
+Cycript.ios
+Cycript.osx

 Cycript.lib
 Cycript.lib

diff --git a/cycript-mac.xml b/cycript-mac.xml
deleted file mode 100644 (file)
index df80de7..0000000
--- a/cycript-mac.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-</dict>
-</plist>

diff --git a/cycript-osx.xml b/cycript-osx.xml
new file mode 100644 (file)
index 0000000..df80de7
--- /dev/null
+++ b/cycript-osx.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

diff --git a/xcode.mk b/xcode.mk
index 57f354f9ceef1fc153fbf0feddaec329e21889f2..87eb376c118754e55c206aec4fd738e7705eb532 100644 (file)
--- a/xcode.mk
+++ b/xcode.mk
@@ -39,7 +39,7 @@ framework :=
 framework += Cycript
 framework += Headers/Cycript.h
 
 framework += Cycript
 framework += Headers/Cycript.h
 

-framework := $(foreach os,ios mac,$(foreach file,$(framework),Cycript-$(os).framework/$(file)))
+framework := $(foreach os,ios osx,$(foreach file,$(framework),Cycript.$(os)/Cycript.framework/$(file)))

 
 links := 
 links += Cycript.lib/libsubstrate.dylib
 
 links := 
 links += Cycript.lib/libsubstrate.dylib


@@ -49,7 +49,7 @@ all: cycript $(cycript) $(framework)
 
 $(zip): all
        rm -f $@
 
 $(zip): all
        rm -f $@

-       zip -r9y $@ cycript Cycript.lib Cycript-{ios,mac}.framework $(patsubst %,--exclude %,$(links))
+       zip -r9y $@ cycript Cycript.lib Cycript.{ios,osx} $(patsubst %,--exclude %,$(links))

        zip -r9 $@ $(links)
 
 zip: $(zip)
        zip -r9 $@ $(links)
 
 zip: $(zip)


@@ -88,14 +88,14 @@ build.$(1)-$(2)/.libs/libcycript.dylib: build-$(1)-$(2)
        @
 endef
 
        @
 endef
 

-define build_mac
-$(call build_any,mac,$(1))
-$(call build_lib,mac,$(1))
-build.mac-$(1)/.libs/cycript: build-mac-$(1)
+define build_osx
+$(call build_any,osx,$(1))
+$(call build_lib,osx,$(1))
+build.osx-$(1)/.libs/cycript: build-osx-$(1)

        @
 endef
 
        @
 endef
 

-$(foreach arch,i386 x86_64,$(eval $(call build_mac,$(arch))))
+$(foreach arch,i386 x86_64,$(eval $(call build_osx,$(arch))))

 
 define build_ios
 $(call build_any,ios,$(1))
 
 define build_ios
 $(call build_any,ios,$(1))


@@ -123,7 +123,7 @@ endef
 
 $(foreach arch,armv6 arm64,$(eval $(call build_arm,$(arch))))
 
 
 $(foreach arch,armv6 arm64,$(eval $(call build_arm,$(arch))))
 

-Cycript.lib/libcycript.dylib: build.mac-i386/.libs/libcycript.dylib build.mac-x86_64/.libs/libcycript.dylib build.ios-armv6/.libs/libcycript.dylib build.ios-arm64/.libs/libcycript.dylib
+Cycript.lib/libcycript.dylib: build.osx-i386/.libs/libcycript.dylib build.osx-x86_64/.libs/libcycript.dylib build.ios-armv6/.libs/libcycript.dylib build.ios-arm64/.libs/libcycript.dylib

        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@
        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@


@@ -134,7 +134,7 @@ Cycript.lib/libcycript.dylib: build.mac-i386/.libs/libcycript.dylib build.mac-x8
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@
        codesign -s $(codesign) --entitlement cycript-$(word 2,$(subst ., ,$(subst -, ,$*))).xml $@
 
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@
        codesign -s $(codesign) --entitlement cycript-$(word 2,$(subst ., ,$(subst -, ,$*))).xml $@
 

-Cycript.lib/%: build.mac-i386/.libs/%_ build.mac-x86_64/.libs/%_ build.ios-armv6/.libs/%_
+Cycript.lib/%: build.osx-i386/.libs/%_ build.osx-x86_64/.libs/%_ build.ios-armv6/.libs/%_

        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
 
        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
 


@@ -154,14 +154,14 @@ libcycript-%.o: build.%/.libs/libcycript.a xcode.map
 libcycript-ios.o: libcycript-ios-armv6.o libcycript-ios-armv7.o libcycript-ios-armv7s.o libcycript-ios-arm64.o libcycript-sim-i386.o libcycript-sim-x86_64.o
        $(lipo) -create -output $@ $^
 
 libcycript-ios.o: libcycript-ios-armv6.o libcycript-ios-armv7.o libcycript-ios-armv7s.o libcycript-ios-arm64.o libcycript-sim-i386.o libcycript-sim-x86_64.o
        $(lipo) -create -output $@ $^
 

-libcycript-mac.o: libcycript-mac-i386.o libcycript-mac-x86_64.o
+libcycript-osx.o: libcycript-osx-i386.o libcycript-osx-x86_64.o

        $(lipo) -create -output $@ $^
 
        $(lipo) -create -output $@ $^
 

-Cycript-%.framework/Cycript: libcycript-%.o
+Cycript.%/Cycript.framework/Cycript: libcycript-%.o

        @mkdir -p $(dir $@)
        cp -a $< $@
 
        @mkdir -p $(dir $@)
        cp -a $< $@
 

-Cycript-%.framework/Headers/Cycript.h: Cycript.h
+Cycript.%/Cycript.framework/Headers/Cycript.h: Cycript.h

        @mkdir -p $(dir $@)
        cp -a $< $@
 
        @mkdir -p $(dir $@)
        cp -a $< $@
 

diff --git a/xcode.sh b/xcode.sh
index ce511a9a48e50828e569e515a09d0140e83910fb..fc5e8b969d51859b60bb3fedb7c31c43f999db8c 100755 (executable)
--- a/xcode.sh
+++ b/xcode.sh
@@ -76,7 +76,7 @@ function build() {
 }
 
 for arch in i386 x86_64; do
 }
 
 for arch in i386 x86_64; do

-    build "mac-${arch}" "${mac}" "-arch ${arch} -mmacosx-version-min=10.6" \
+    build "osx-${arch}" "${mac}" "-arch ${arch} -mmacosx-version-min=10.6" \

         CPPFLAGS="-I../readline" LDFLAGS="-L../readline"
 done
 
         CPPFLAGS="-I../readline" LDFLAGS="-L../readline"
 done