mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

Browse source
This commit is contained in:
David Black 2013-01-21 11:17:52 +00:00
commit d13eb8dfea
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/Vagrantfile vendored
View file

@ -3,7 +3,7 @@ Vagrant::Config.run do |config|
config.vm.box = "precise32" config.vm.box = "precise32"
config.vm.box_url = "/shares/software/OS and Boot/precise32.box" config.vm.box_url = "/shares/software/OS and Boot/precise32.box"
config.vm.customize ["modifyvm", :id, "--memory", "1024"] config.vm.customize ["modifyvm", :id, "--memory", "1536"]
config.vm.provision :shell, :path => "fixpaths.sh" config.vm.provision :shell, :path => "fixpaths.sh"
# Set apt proxy - remove, or adjust this, accordingly! # Set apt proxy - remove, or adjust this, accordingly!

6
buildserver/cookbooks/android-sdk/recipes/default.rb
View file

@ -12,10 +12,10 @@ script "setup-android-sdk" do
user user user user
cwd "/tmp" cwd "/tmp"
code " code "
wget http://dl.google.com/android/android-sdk_r16-linux.tgz wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
tar zxvf android-sdk_r16-linux.tgz tar zxvf android-sdk_r21.0.1-linux.tgz
mv android-sdk-linux #{sdk_loc} mv android-sdk-linux #{sdk_loc}
rm android-sdk_r16-linux.tgz rm android-sdk_r21.0.1-linux.tgz
#{sdk_loc}/tools/android update sdk --no-ui -t platform-tool #{sdk_loc}/tools/android update sdk --no-ui -t platform-tool
#{sdk_loc}/tools/android update sdk --no-ui -t tool #{sdk_loc}/tools/android update sdk --no-ui -t tool
" "

8
fdroidserver/checkupdates.py
View file

@ -231,6 +231,12 @@ def main():
pass pass
elif mode.startswith('Version '): elif mode.startswith('Version '):
pattern = mode[8:] pattern = mode[8:]
if pattern.startswith('+'):
o = pattern.find(' ')
suffix = pattern[1:o]
pattern = pattern[o + 1:]
else:
suffix = ''
gotcur = False gotcur = False
latest = None latest = None
for build in app['builds']: for build in app['builds']:
@ -242,7 +248,7 @@ def main():
newbuild = latest.copy() newbuild = latest.copy()
del newbuild['origlines'] del newbuild['origlines']
newbuild['vercode'] = app['Current Version Code'] newbuild['vercode'] = app['Current Version Code']
newbuild['version'] = app['Current Version'] newbuild['version'] = app['Current Version'] + suffix
print "...auto-generating build for " + newbuild['version'] print "...auto-generating build for " + newbuild['version']
commit = pattern.replace('%v', newbuild['version']) commit = pattern.replace('%v', newbuild['version'])
commit = commit.replace('%c', newbuild['vercode']) commit = commit.replace('%c', newbuild['vercode'])

6
makebuildserver.py
View file

@ -23,7 +23,11 @@ if os.path.exists(boxfile):
vagrant(['halt'], serverdir) vagrant(['halt'], serverdir)
print "Configuring build server VM" print "Configuring build server VM"
vagrant(['up'], serverdir) returncode, out, err = vagrant(['up'], serverdir)
if returncode != 0:
print "Failed to configure server"
print out
print err
print "Stopping build server VM" print "Stopping build server VM"
vagrant(['halt'], serverdir) vagrant(['halt'], serverdir)