Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ build/*
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
profile
*.moved-aside
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
language: objective-c

script: travis/build.sh
osx_image: xcode7.3
script: ./travisMac
40 changes: 0 additions & 40 deletions Gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion ObjectiveCSlim.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "rm -rf /tmp/ObjectiveCSlim\nmkdir /tmp/ObjectiveCSlim\ncp -r $CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME /tmp/ObjectiveCSlim/$FULL_PRODUCT_NAME\n./bin/Mac/RunSlimTests";
shellScript = "mkdir -p ./build/ObjectiveCSlim\ncp -r $CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME ./build/ObjectiveCSlim/$FULL_PRODUCT_NAME\n./bin/Mac/RunSlimTests";
};
07CB31521827E20A008F4658 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
10 changes: 10 additions & 0 deletions ObjectiveCSlim.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E" : 0,
"2184FCAD113E505BCD603D89586240249E5E2A1B" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "81B1387C-A182-4F4D-B759-C2A650684CA9",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E" : "ObjectiveCSlim\/",
"2184FCAD113E505BCD603D89586240249E5E2A1B" : "ObjectiveCSlim\/cslim\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "ObjectiveCSlim",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "ObjectiveCSlim.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/dougbradbury\/cslim.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2184FCAD113E505BCD603D89586240249E5E2A1B"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ericmeyer\/ObjectiveCSlim.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E"
}
]
}
2 changes: 2 additions & 0 deletions README.markdown
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Using Objective C Slim

[![Build Status](https://travis-ci.org/ericmeyer/ObjectiveCSlim.svg?branch=master)](https://travis-ci.org/ericmeyer/ObjectiveCSlim)

## See here for installation/setup instructions: https://github.com/ericmeyer/OCSlim-Templates

# What is Objective C Slim?
Expand Down
4 changes: 3 additions & 1 deletion bin/Mac/RunSlimTests
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
if [[ $SLIM_PORT ]]; then
"/tmp/ObjectiveCSlim/AcceptanceTests.app/Contents/MacOS/AcceptanceTests" $SLIM_PORT
echo "Running tests on port $SLIM_PORT"
"./build/ObjectiveCSlim/AcceptanceTests.app/Contents/MacOS/AcceptanceTests" $SLIM_PORT
else
echo "Running tests headless"
"./bin/Mac/RunSlimTestsHeadless"
fi
2 changes: 1 addition & 1 deletion bin/Mac/RunSlimTestsTargetWithSlimPort
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#! /bin/sh

SLIM_PORT=$1 xcodebuild -workspace "ObjectiveCSlim.xcworkspace/" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build
SLIM_PORT=$1 xcodebuild -workspace "ObjectiveCSlim.xcworkspace" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build
4 changes: 0 additions & 4 deletions travis/build.sh

This file was deleted.

3 changes: 3 additions & 0 deletions travisMac
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
xcodebuild -workspace "ObjectiveCSlim.xcworkspace" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build
ls -lR ./build
java -jar fitnesse-standalone.jar -c "MacRunnerTests?suite&format=text"