Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switching RestKit dependency to new RestKit fork, updating to latest RestKit #28

Merged
merged 11 commits into from
Jan 20, 2012
Merged

Switching RestKit dependency to new RestKit fork, updating to latest RestKit #28

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1336e60
remove old restkit ref
tstellanova-sfdc Jan 20, 2012
76534a1
remove old submodule ref
tstellanova-sfdc Jan 20, 2012
eaee4b0
point to new RestKit fork as submodule
tstellanova-sfdc Jan 20, 2012
b255769
update to newest restkit
tstellanova-sfdc Jan 20, 2012
70d36dd
fix RestKit build.xml to grab build products from new locations
tstellanova-sfdc Jan 20, 2012
b8805fe
reference new restkit structure in RestExplorer and SalesforceSDK
tstellanova-sfdc Jan 20, 2012
00685e9
update sdk dists; add libRestKit.a back to RestExplorer
tstellanova-sfdc Jan 20, 2012
cf22f51
update restkit dependencies in native app template
tstellanova-sfdc Jan 20, 2012
686c94a
fix test that was failing due to improper SOSL escaping of current date
tstellanova-sfdc Jan 20, 2012
ff312df
ensure that we synchronize all submodule refs, in case the user has a…
tstellanova-sfdc Jan 20, 2012
7f9d7fc
cleanup build.xml and tests based on code review
tstellanova-sfdc Jan 20, 2012
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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "external/RestKit/RestKit"]
path = external/RestKit/RestKit
url = https://github.com/RestKit/RestKit.git
[submodule "external/json-framework/json-framework"]
path = external/json-framework/json-framework
url = https://github.com/stig/json-framework.git
Expand All @@ -10,3 +7,6 @@
[submodule "external/shared"]
path = external/shared
url = https://github.com/forcedotcom/SalesforceMobileSDK-Shared.git
[submodule "external/RestKit/RestKit"]
path = external/RestKit/RestKit
url = https://github.com/forcedotcom/RestKit.git
Binary file modified dist/SalesforceSDK/SalesforceSDK-Debug.zip
View file
Open in desktop
Binary file not shown.
Binary file modified dist/SalesforceSDK/SalesforceSDK-Release.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion external/RestKit/RestKit
Open in desktop
Submodule RestKit updated 1243 files
113 changes: 69 additions & 44 deletions external/RestKit/sfdc_build/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<target name="build" description="builds all targets, runs unit tests and generates code coverage report">
<antcall target="compileDebug"/>
<antcall target="compileRelease"/>
<delete dir="${project.dir}/Build"/>
<delete dir="${project.dir}/build"/>
</target>

<target name="pre" depends="initArtifacts"/>
Expand All @@ -41,87 +41,111 @@
<mkdir dir="${artifacts.dir}"/>
</target>

<target name="compileDebug">
<target name="compileDebug" depends="pre">
<property name="configuration" value="${configuration.debug}" />
<property name="buildProductsDir" value="${project.dir}/build" />

<antcall target="iOSShared.compile">
<param name="install_path" value="${artifacts.dir}/${target.name}"/>
<param name="install_path" value="${artifacts.dir}/${configuration}-${platform.iphoneos}"/>
<param name="configuration" value="${configuration}"/>
<param name="sdk" refid="platform.iphoneos"/>
<param name="target" value="RestKit"/>
<param name="action" value="install"/>
<!-- <param name="action" value="install"/> -->
</antcall>

<copy todir="${artifacts.dir}/${configuration}-${platform.iphoneos}">
<fileset dir="${buildProductsDir}/${configuration}-${platform.iphoneos}"/>
</copy>

<antcall target="iOSShared.compile">
<param name="install_path" value="${artifacts.dir}/Simulator"/>
<param name="install_path" value="${artifacts.dir}/${configuration}-${platform.iphonesimulator}"/>
<param name="configuration" value="${configuration}"/>
<param name="sdk" refid="platform.iphonesimulator"/>
<param name="target" value="RestKit"/>
<param name="action" value="install"/>
<!-- <param name="action" value="install"/> -->
</antcall>

<copy todir="${artifacts.dir}/${configuration}-${platform.iphonesimulator}">
<fileset dir="${buildProductsDir}/${configuration}-${platform.iphonesimulator}"/>
</copy>

<!-- RestKit sticks its output in an unusual place -->
<property name="buildProductsDir" value="${artifacts.dir}/BuildProductsPath" />
<property name="simulatorLibDir" value="${buildProductsDir}/${configuration}-iphonesimulator" />
<property name="deviceLibDir" value="${buildProductsDir}/${configuration}-iphoneos" />
<property name="deviceLibDir" value="${artifacts.dir}/${configuration}-${sdk.iphoneos}" />
<property name="simulatorLibDir" value="${artifacts.dir}/${configuration}-${platform.iphonesimulator}" />

<property name="destinationDir" value="${artifacts.dir}/${target.name}" />

<antcall target="iOSShared.lipo_full">
<param name="libname" value="libRestKitCoreData.a"/>
</antcall>
<antcall target="iOSShared.lipo_full">
<param name="libname" value="libRestKitNetwork.a"/>
</antcall>
<antcall target="iOSShared.lipo_full">
<param name="libname" value="libRestKitObjectMapping.a"/>
</antcall>
<antcall target="iOSShared.lipo_full">
<param name="libname" value="libRestKitSupport.a"/>
</antcall>
<antcall target="iOSShared.lipo_full">
<param name="libname" value="libRestKitXMLParserLibxml.a"/>
</antcall>

<antcall target="iOSShared.lipo_full">
<param name="libname" value="libRestKit.a"/>
</antcall>


<!-- Copy includes along with libs -->
<move file="${deviceLibDir}/include" toFile="${artifacts.dir}/${target.name}/include" />
<copy todir="${destinationDir}/include">
<fileset dir="${deviceLibDir}/include"/>
</copy>
<!-- <move file="${buildProductsDir}/include" toFile="${artifacts.dir}/${target.name}/include" /> -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a line you wanted to leave for future reference, or one you'd want to take out?


<antcall target="iOSShared.compress">
<param name="destfile" value="${artifacts.dir}/${target.name}-Debug.zip"/>
<param name="basedir" value="${artifacts.dir}/${target.name}"/>
<param name="destfile" value="${artifacts.dir}/${target.name}-${configuration}.zip"/>
<param name="basedir" value="${destinationDir}"/>
</antcall>

<delete dir="${artifacts.dir}/${target.name}"/>
<delete dir="${buildProductsDir}"/>
</target>

<target name="compileRelease">

<target name="compileRelease" depends="pre">
<property name="configuration" value="${configuration.release}" />
<property name="deviceLibDir" value="${artifacts.dir}/BuildProductsPath/${configuration}-iphoneos" />
<property name="buildProductsDir" value="${artifacts.dir}/BuildProductsPath" />
<property name="buildProductsDir" value="${project.dir}/build" />

<antcall target="iOSShared.compile">
<param name="install_path" value="${artifacts.dir}/${target.name}"/>
<param name="install_path" value="${artifacts.dir}/${configuration}-${platform.iphoneos}"/>
<param name="configuration" value="${configuration}"/>
<param name="sdk" refid="platform.iphoneos"/>
<param name="target" value="RestKit"/>
<param name="action" value="install"/>
<!-- <param name="action" value="install"/> -->
</antcall>

<copy todir="${artifacts.dir}/${configuration}-${platform.iphoneos}">
<fileset dir="${buildProductsDir}/${configuration}-${platform.iphoneos}"/>
</copy>

<antcall target="iOSShared.compile">
<param name="install_path" value="${artifacts.dir}/${configuration}-${platform.iphonesimulator}"/>
<param name="configuration" value="${configuration}"/>
<param name="sdk" refid="platform.iphonesimulator"/>
<param name="target" value="RestKit"/>
<!-- <param name="action" value="install"/> -->
</antcall>

<copy todir="${artifacts.dir}/${configuration}-${platform.iphonesimulator}">
<fileset dir="${buildProductsDir}/${configuration}-${platform.iphonesimulator}"/>
</copy>

<!-- RestKit sticks its output in an unusual place -->
<property name="deviceLibDir" value="${artifacts.dir}/${configuration}-${sdk.iphoneos}" />
<property name="simulatorLibDir" value="${artifacts.dir}/${configuration}-${platform.iphonesimulator}" />

<property name="destinationDir" value="${artifacts.dir}/${target.name}" />


<antcall target="iOSShared.lipo_full">
<param name="libname" value="libRestKit.a"/>
</antcall>


<!-- Copy includes along with libs -->
<move todir="${artifacts.dir}/${target.name}">
<filelist dir="${deviceLibDir}">
<file name="libRestKitCoreData.a"/>
<file name="libRestKitNetwork.a"/>
<file name="libRestKitObjectMapping.a"/>
<file name="libRestKitSupport.a"/>
<file name="libRestKitXMLParserLibxml.a"/>
</filelist>
</move>
<move file="${deviceLibDir}/include" toFile="${artifacts.dir}/${target.name}/include" />
<copy todir="${destinationDir}/include">
<fileset dir="${deviceLibDir}/include"/>
</copy>
<!-- <move file="${buildProductsDir}/include" toFile="${artifacts.dir}/${target.name}/include" /> -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same?


<antcall target="iOSShared.compress">
<param name="destfile" value="${artifacts.dir}/${target.name}-Release.zip"/>
<param name="basedir" value="${artifacts.dir}/${target.name}"/>
<param name="destfile" value="${artifacts.dir}/${target.name}-${configuration}.zip"/>
<param name="basedir" value="${destinationDir}"/>
</antcall>

<delete dir="${artifacts.dir}/${target.name}"/>
Expand All @@ -130,5 +154,6 @@

<target name="clean">
<delete dir="${artifacts.dir}"/>
<delete dir="${project.dir}/build"/>
</target>
</project>
1 change: 1 addition & 0 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

# ensure that we have the correct version of all submodules
git submodule init
git submodule sync
git submodule update

CURRENT_DIR=`pwd`
Expand Down
Loading