Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Framework compiles again

  • Loading branch information...
commit 33c2f6262cab4a217eca9d1930158d9f2f529b56 1 parent 1517247
@probablycorey authored
View
4 lib/wax_stdlib.h
3 additions, 1 deletion not shown
View
2  tools/Framework/Framework.plist
@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>Wax</string>
+ <string>wax</string>
<key>CFBundleIdentifier</key>
<string>com.probablyinteractive.wax</string>
<key>CFBundleInfoDictionaryVersion</key>
View
10 tools/Framework/Framework.xcodeproj/project.pbxproj
@@ -184,14 +184,14 @@
043D107B12C92D6700775F70 /* wax_struct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wax_struct.h; sourceTree = "<group>"; };
043D107C12C92D6700775F70 /* wax_struct.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = wax_struct.m; sourceTree = "<group>"; };
AA747D9E0F9514B9006C5449 /* Framework_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Framework_Prefix.pch; sourceTree = SOURCE_ROOT; };
- D2AAC07E0554694100DB518D /* libWax.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWax.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ D2AAC07E0554694100DB518D /* libwax.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwax.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
- D2AAC07E0554694100DB518D /* libWax.a */,
+ D2AAC07E0554694100DB518D /* libwax.a */,
);
name = Products;
sourceTree = "<group>";
@@ -485,7 +485,7 @@
);
name = Wax;
productName = Framework;
- productReference = D2AAC07E0554694100DB518D /* libWax.a */;
+ productReference = D2AAC07E0554694100DB518D /* libwax.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
@@ -607,7 +607,7 @@
HEADER_SEARCH_PATHS = "$(SDK_ROOT)/usr/include/libxml2";
INSTALL_PATH = /usr/local/lib;
OTHER_LDFLAGS = "";
- PRODUCT_NAME = Framework;
+ PRODUCT_NAME = wax;
};
name = Debug;
};
@@ -626,7 +626,7 @@
LINK_WITH_STANDARD_LIBRARIES = NO;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "";
- PRODUCT_NAME = Wax;
+ PRODUCT_NAME = wax;
STRIP_STYLE = all;
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = framework;
View
80 tools/Framework/Scripts/package
@@ -1,45 +1,45 @@
-#!/bin/bash
+#!/bin/bash
-FRAMEWORK_NAME=wax
-FRAMEWORK_VERSION=A
+FRAMEWORK_NAME=wax
+FRAMEWORK_VERSION=A
FRAMEWORK_CURRENT_VERSION=0.9
FRAMEWORK_COMPATIBILITY_VERSION=0.9
-BUILD_TYPE=Release
+BUILD_TYPE=Release
-# This is the full name of the framework we'll build
-FRAMEWORK_DIR=$FRAMEWORK_NAME.framework
+# This is the full name of the framework we'll build
+FRAMEWORK_DIR=$FRAMEWORK_NAME.framework
-# Clean any existing framework that might be there already
-echo "Framework: Cleaning framework..."
+# Clean any existing framework that might be there already
+echo "Framework: Cleaning framework..."
[ -d "$FRAMEWORK_DIR" ] && \
rm -rf "$FRAMEWORK_DIR"
-# Build the canonical Framework bundle directory structure
-echo "Framework: Setting up directories..."
-mkdir -p $FRAMEWORK_DIR
-mkdir -p $FRAMEWORK_DIR/Versions
-mkdir -p $FRAMEWORK_DIR/Versions/$FRAMEWORK_VERSION
-mkdir -p $FRAMEWORK_DIR/Versions/$FRAMEWORK_VERSION/Resources
-mkdir -p $FRAMEWORK_DIR/Versions/$FRAMEWORK_VERSION/Headers
+# Build the canonical Framework bundle directory structure
+echo "Framework: Setting up directories..."
+mkdir -p $FRAMEWORK_DIR
+mkdir -p $FRAMEWORK_DIR/Versions
+mkdir -p $FRAMEWORK_DIR/Versions/$FRAMEWORK_VERSION
+mkdir -p $FRAMEWORK_DIR/Versions/$FRAMEWORK_VERSION/Resources
+mkdir -p $FRAMEWORK_DIR/Versions/$FRAMEWORK_VERSION/Headers
-echo "Framework: Creating symlinks..."
-ln -s $FRAMEWORK_VERSION $FRAMEWORK_DIR/Versions/Current
-ln -s Versions/Current/Headers $FRAMEWORK_DIR/Headers
-ln -s Versions/Current/Resources $FRAMEWORK_DIR/Resources
-ln -s Versions/Current/$FRAMEWORK_NAME $FRAMEWORK_DIR/$FRAMEWORK_NAME
+echo "Framework: Creating symlinks..."
+ln -s $FRAMEWORK_VERSION $FRAMEWORK_DIR/Versions/Current
+ln -s Versions/Current/Headers $FRAMEWORK_DIR/Headers
+ln -s Versions/Current/Resources $FRAMEWORK_DIR/Resources
+ln -s Versions/Current/$FRAMEWORK_NAME $FRAMEWORK_DIR/$FRAMEWORK_NAME
-# Check that this is what your static libraries are called
-FRAMEWORK_INPUT_ARM_FILES="build/$BUILD_TYPE-iphoneos/lib$FRAMEWORK_NAME.a"
+# Check that this is what your static libraries are called
+FRAMEWORK_INPUT_ARM_FILES="build/$BUILD_TYPE-iphoneos/lib$FRAMEWORK_NAME.a"
FRAMEWORK_INPUT_I386_FILES="build/$BUILD_TYPE-iphonesimulator/lib$FRAMEWORK_NAME.a"
-# The trick for creating a fully usable library is
-# to use lipo to glue the different library
-# versions together into one file. When an
-# application is linked to this library, the
-# linker will extract the appropriate platform
-# version and use that.
-# The library file is given the same name as the
-# framework with no .a extension.
+# The trick for creating a fully usable library is
+# to use lipo to glue the different library
+# versions together into one file. When an
+# application is linked to this library, the
+# linker will extract the appropriate platform
+# version and use that.
+# The library file is given the same name as the
+# framework with no .a extension.
echo "Framework: Creating library..."
@@ -47,19 +47,19 @@ lipo \
"$FRAMEWORK_INPUT_ARM_FILES" \
-create \
-arch i386 "$FRAMEWORK_INPUT_I386_FILES" \
- -o "$FRAMEWORK_DIR/Versions/Current/$FRAMEWORK_NAME"
+ -o "$FRAMEWORK_DIR/Versions/Current/$FRAMEWORK_NAME"
-# Now copy the final assets over: your library
-# header files and the plist file
+# Now copy the final assets over: your library
+# header files and the plist file
echo "Framework: Copying assets into current version..."
-cp wax/lib/wax.h $FRAMEWORK_DIR/Headers/
-cp wax/lib/lua/lua.h $FRAMEWORK_DIR/Headers/
-cp wax/lib/lua/luaconf.h $FRAMEWORK_DIR/Headers/
-cp wax/lib/extensions/HTTP/wax_http.h $FRAMEWORK_DIR/Headers/
-cp wax/lib/extensions/json/wax_json.h $FRAMEWORK_DIR/Headers/
-cp wax/lib/extensions/xml/wax_xml.h $FRAMEWORK_DIR/Headers/
-cp wax/lib/extensions/filesystem/wax_filesystem.h $FRAMEWORK_DIR/Headers/
+cp wax/lib/wax.h $FRAMEWORK_DIR/Headers/
+cp wax/lib/lua/lua.h $FRAMEWORK_DIR/Headers/
+cp wax/lib/lua/luaconf.h $FRAMEWORK_DIR/Headers/
+cp wax/lib/extensions/HTTP/wax_http.h $FRAMEWORK_DIR/Headers/
+cp wax/lib/extensions/json/wax_json.h $FRAMEWORK_DIR/Headers/
+cp wax/lib/extensions/xml/wax_xml.h $FRAMEWORK_DIR/Headers/
+cp wax/lib/extensions/filesystem/wax_filesystem.h $FRAMEWORK_DIR/Headers/
cp Framework.plist $FRAMEWORK_DIR/Resources/Info.plist
cp wax/lib/build-scripts/copy-scripts.sh $FRAMEWORK_DIR/Resources/
Please sign in to comment.
Something went wrong with that request. Please try again.