From 5179ca5655eec9c1a7947d5303346fc9db1723ed Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 8 Nov 2013 22:18:56 -0400 Subject: [PATCH] Removed an obsolete file --- platform/macosx/autobuild | 53 ------------------- .../macosx/love.xcodeproj/project.pbxproj | 12 ++--- 2 files changed, 6 insertions(+), 59 deletions(-) delete mode 100755 platform/macosx/autobuild diff --git a/platform/macosx/autobuild b/platform/macosx/autobuild deleted file mode 100755 index b7aa7bef5..000000000 --- a/platform/macosx/autobuild +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -cd ../.. - -# Check which revision to build. -if [ -z $2 ]; then - buildrev="tip" -else - buildrev=$2 -fi - -# Update to the appropriate revision. -hg pull -hg update $buildrev - -# Set the displayversion. -if [ -z $3 ]; then - if [ "$buildrev" == "tip" ]; then - # Get the current SVN version, use sed to remove any non-numbers. - currentversion=`hg log -l1 | grep changeset | sed 's/.*://g'` - currentdate=`date +%Y%m%d` - displayversion="$currentdate-$currentversion" - else - # The revision is already specified, so we'll use that as the - # display version. - displayversion="$buildrev" - fi -else - # If the param is present, it overrides everything else. - displayversion=$3 -fi - -cd platform/macosx - -outfile="love-$displayversion-macosx-ub" -outdmg="$outfile.dmg" -outlog="$outfile.log" - -xcodebuild > $outlog 2>&1 - -cp love.dmg $outdmg - -# Deal with uploading. -if [ "$1" == "build" ]; then - pass=`cat pwtehlol` - ftp -u ftp://love2d:$pass@love2d.org/public_html/builds/files/$outdmg $outdmg - ftp -u ftp://love2d:$pass@love2d.org/public_html/builds/files/$outlog $outlog -fi - -if [ "$1" == "release" ]; then - echo "release" -fi - diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj index d1f31c70a..07af9a558 100644 --- a/platform/macosx/love.xcodeproj/project.pbxproj +++ b/platform/macosx/love.xcodeproj/project.pbxproj @@ -26,7 +26,7 @@ FA9B4A0A16E1579F00074F42 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA9B4A0916E1579F00074F42 /* SDL2.framework */; }; FA9B4A0B16E157B500074F42 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = FA9B4A0916E1579F00074F42 /* SDL2.framework */; }; FAAFF04716CB120000CCDE45 /* OpenAL-Soft.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = FAAFF04616CB120000CCDE45 /* OpenAL-Soft.framework */; }; - FAC8E8D416F3C468004DADF3 /* osx.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAC8E8D316F3C468004DADF3 /* osx.mm */; }; + FAC8E8D416F3C468004DADF3 /* OSX.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAC8E8D316F3C468004DADF3 /* OSX.mm */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -83,8 +83,8 @@ FA577A9316C7217800860150 /* love-framework.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "love-framework.xcodeproj"; sourceTree = ""; }; FA9B4A0916E1579F00074F42 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = ""; }; FAAFF04616CB120000CCDE45 /* OpenAL-Soft.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "OpenAL-Soft.framework"; path = "/Library/Frameworks/OpenAL-Soft.framework"; sourceTree = ""; }; - FAC8E8D316F3C468004DADF3 /* osx.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = osx.mm; sourceTree = ""; }; - FAC8E8D616F3C46E004DADF3 /* osx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = osx.h; sourceTree = ""; }; + FAC8E8D316F3C468004DADF3 /* OSX.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OSX.mm; sourceTree = ""; }; + FAC8E8D616F3C46E004DADF3 /* OSX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSX.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -166,8 +166,8 @@ isa = PBXGroup; children = ( A93E6A3410420AC0007D418B /* love.cpp */, - FAC8E8D616F3C46E004DADF3 /* osx.h */, - FAC8E8D316F3C468004DADF3 /* osx.mm */, + FAC8E8D616F3C46E004DADF3 /* OSX.h */, + FAC8E8D316F3C468004DADF3 /* OSX.mm */, ); name = Source; sourceTree = ""; @@ -255,7 +255,7 @@ buildActionMask = 2147483647; files = ( A93E6EED10420BA8007D418B /* love.cpp in Sources */, - FAC8E8D416F3C468004DADF3 /* osx.mm in Sources */, + FAC8E8D416F3C468004DADF3 /* OSX.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };