Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-ios
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-ios
Commits
a68931d4
Commit
a68931d4
authored
8 years ago
by
Edric Milaret
Committed by
gerrit2
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix build script
Change-Id: Iab48c40d98c9c97c6a5bf67bb7c818b50d700b62 Tuleap: #313
parent
a2a4985f
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
compile-ios.sh
+15
-5
15 additions, 5 deletions
compile-ios.sh
with
15 additions
and
5 deletions
compile-ios.sh
+
15
−
5
View file @
a68931d4
...
@@ -63,11 +63,21 @@ CC="xcrun -sdk $SDK clang"
...
@@ -63,11 +63,21 @@ CC="xcrun -sdk $SDK clang"
CXX
=
"xcrun -sdk
$SDK
clang++"
CXX
=
"xcrun -sdk
$SDK
clang++"
IOS_TOP_DIR
=
"
$(
pwd
)
"
IOS_TOP_DIR
=
"
$(
pwd
)
"
DAEMON_DIR
=
"
$(
pwd
)
/../daemon"
cd
$DAEMON_DIR
# TEMPORARY (until everything is merged)
if
[
-z
"
$DAEMON_DIR
"
]
;
then
git fetch https://gerrit-ring.savoirfairelinux.com/ring-daemon refs/changes/38/4438/5
&&
git checkout FETCH_HEAD
DAEMON_DIR
=
"
$(
pwd
)
/../daemon"
echo
"DAEMON_DIR not provided trying to find it in
$DAEMON_DIR
"
fi
if
[
!
-d
"
$DAEMON_DIR
"
]
;
then
echo
'Daemon not found.'
echo
'If you cloned the daemon in a custom location override'
\
'DAEMON_DIR to point to it'
echo
"You can also use our meta repo which contains both:
https://gerrit-ring.savoirfairelinux.com/#/admin/projects/ring-project"
exit
1
fi
cd
$DAEMON_DIR
for
ARCH
in
"
${
ARCHS
[@]
}
"
for
ARCH
in
"
${
ARCHS
[@]
}
"
do
do
...
@@ -76,7 +86,7 @@ do
...
@@ -76,7 +86,7 @@ do
if
test
-z
"
$HOST
"
if
test
-z
"
$HOST
"
then
then
if
$ARCH
eq
"arm64"
if
[
"
$ARCH
"
=
"arm64"
]
then
then
HOST
=
aarch64-apple-darwin_ios
HOST
=
aarch64-apple-darwin_ios
else
else
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment