Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
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-daemon
Commits
a17b78c1
Commit
a17b78c1
authored
10 years ago
by
Simon Piette
Browse files
Options
Downloads
Patches
Plain Diff
Move the commands from setenv.sh to launchpad script
Refs 55333 Change-Id: Ice7c2dbcde8fba7aaa4a1c76e93a7c0198113b8f
parent
b0873806
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/build-system/launch-build-machine-jenkins.sh
+25
-46
25 additions, 46 deletions
tools/build-system/launch-build-machine-jenkins.sh
tools/build-system/setenv.sh
+3
-28
3 additions, 28 deletions
tools/build-system/setenv.sh
with
28 additions
and
74 deletions
tools/build-system/launch-build-machine-jenkins.sh
+
25
−
46
View file @
a17b78c1
#!/bin/bash
#!/bin/bash
#####################################################
# run with --help for documentation
# File Name: launch-build-machine-jenkins.sh
#
# Purpose :
#
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-10-20
# Last Modified: 2010-04-22 16:42:57 -0400
#####################################################
set
-x
set
-x
set
-e
#Check dependencies
#Check dependencies
# Download the KDE client release script
for
cmd
in
curl ruby git svn
if
!
command
-v
curl
;
then
do
echo
Please
install
curl
if
!
command
-v
$cmd
;
then
exit
1
echo
"
$cmd
is missing"
>
&2
fi
# Merge the KDE translation files
if
!
command
-v
ruby
;
then
echo
Please
install
ruby
exit
1
fi
# Download the KDE client and scripts
if
!
command
-v
git
;
then
echo
Please
install
git
exit
1
fi
# Fetch KDE translations, the gnome client use bzr
if
!
command
-v
svn
;
then
echo
Please
install
svn
exit
1
exit
1
fi
fi
done
source
$(
dirname
$0
)
/setenv.sh
.
`
dirname
$0
`
/setenv.sh
# Update KDE client
# $WORKSPACE is declared in setenv.sh
cd
"
$WORKSPACE
"
curl
-O
https://projects.kde.org/projects/playground/network/sflphone-kde/repository/revisions/master/raw/data/config.ini
curl
-O
https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts/repository/revisions/master/raw/createtarball/create_tarball.rb
ruby create_tarball.rb
-n
-a
sflphone-kde
rm
-rf
kde
rm
-rf
sflphone-kde-
*
.tar.
*
rm
create_tarball.rb config.ini
mv
sflphone-kde-
*
kde
IS_RELEASE
=
IS_RELEASE
=
VERSION_INDEX
=
"1"
VERSION_INDEX
=
"1"
...
@@ -50,11 +39,11 @@ VERSION_NUMBER="1.4.1"
...
@@ -50,11 +39,11 @@ VERSION_NUMBER="1.4.1"
LAUNCHPAD_PACKAGES
=(
"sflphone-daemon"
"sflphone-kde"
"sflphone-gnome"
"sflphone-plugins"
"sflphone-daemon-video"
"sflphone-gnome-video"
)
LAUNCHPAD_PACKAGES
=(
"sflphone-daemon"
"sflphone-kde"
"sflphone-gnome"
"sflphone-plugins"
"sflphone-daemon-video"
"sflphone-gnome-video"
)
echo
cat
<<
EOF
echo
" /***********************
\\
"
_________________________
echo
"
| SFLPhone build system |
"
| SFLPhone build system |
echo
"
\\
***********************/"
-------------------------
echo
EOF
for
PARAMETER
in
$*
for
PARAMETER
in
$*
...
@@ -308,16 +297,6 @@ END
...
@@ -308,16 +297,6 @@ END
cp
${
DEBIAN_DIR
}
/changelog.generic
${
DEBIAN_DIR
}
/changelog
cp
${
DEBIAN_DIR
}
/changelog.generic
${
DEBIAN_DIR
}
/changelog
done
done
# if push is activated
#if [[ ${DO_PUSH} && ${IS_RELEASE} ]];then
# echo " Doing commit"
# git commit -m "[#1262] Released ${SOFTWARE_VERSION}" .
#
# echo " Pushing commit"
# git push origin release
#fi
# Archive source tarball for Debian maintainer
# Archive source tarball for Debian maintainer
.
${
WORKING_DIR
}
/build_tarball.sh
${
SOFTWARE_VERSION
}
.
${
WORKING_DIR
}
/build_tarball.sh
${
SOFTWARE_VERSION
}
...
...
This diff is collapsed.
Click to expand it.
tools/build-system/setenv.sh
+
3
−
28
View file @
a17b78c1
#!/bin/bash
#!/bin/bash
#####################################################
# Export environment variables for launch-build-machine-jenkins.sh script.
# File Name: setenv.sh
#
# Purpose : Export environment variables for launch-build-machine-jenkins.sh script.
# Fetch the latest KDE client code from KDE repository
#
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-12-15
# Last Modified: 2014-03-21 13:16:52 -0500
#####################################################
# home directory
# home directory
export
ROOT_DIR
=
${
HOME
}
export
ROOT_DIR
=
${
HOME
}
...
@@ -22,23 +12,8 @@ export EDITOR="echo"
...
@@ -22,23 +12,8 @@ export EDITOR="echo"
export
REFERENCE_REPOSITORY
=
"
${
WORKSPACE
}
"
export
REFERENCE_REPOSITORY
=
"
${
WORKSPACE
}
"
# In case the script is executed manually, replace the variables set by Jenkins
# In case the script is executed manually, replace the variables set by Jenkins
if
[
"
${
WORKSPACE
}
"
==
""
]
;
then
WORKSPACE
=
${
WORKSPACE
:
=.
}
WORKSPACE
=
"."
fi
export
WORKING_DIR
=
"
${
WORKSPACE
}
/tools/build-system"
export
WORKING_DIR
=
"
${
WORKSPACE
}
/tools/build-system"
export
LAUNCHPAD_DIR
=
"
${
WORKING_DIR
}
/launchpad"
export
LAUNCHPAD_DIR
=
"
${
WORKING_DIR
}
/launchpad"
LAUNCHPAD_DISTRIBUTIONS
=(
"trusty utopic"
)
export
LAUNCHPAD_DISTRIBUTIONS
=(
"trusty utopic"
)
export
LAUNCHPAD_DISTRIBUTIONS
# Update KDE client
cd
${
WORKSPACE
}
rm
-rf
config.ini
rm
-rf
kde
curl https://projects.kde.org/projects/playground/network/sflphone-kde/repository/revisions/master/raw/data/config.ini
>
config.ini
git clone http://anongit.kde.org/kde-dev-scripts
ruby kde-dev-scripts/createtarball/create_tarball.rb
-n
-a
sflphone-kde
rm
-rf
kde-dev-scripts
tar
-xpvf
sflphone-kde-
*
.tar.
*
rm
-rf
sflphone-kde-
*
.tar.
*
mv
sflphone-kde-
*
kde
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