kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00
Code Activity

Some more kivy wip

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-11-26 22:04:40 +00:00
parent 53781f913b
commit 62e03f84f7
5 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildserver/cookbooks/kivy/recipes/default.rb
View File

@ -1,7 +1,7 @@
user = node[:settings][:user]
%w{cython python-pygame python-pip python-opengl python-gst0.10 python-enchant libgl1-mesa-dev libgles2-mesa-dev}.each do |pkg|
%w{cython python-pygame python-opengl python-gst0.10 python-enchant libgl1-mesa-dev libgles2-mesa-dev}.each do |pkg|
package pkg do
action :install
end
@ -13,7 +13,7 @@ script "install-kivy" do
code "
tar xf /vagrant/cache/Kivy-1.7.2.tar.gz
cd Kivy-1.7.2
python setup.py install
sudo python setup.py install
cd ..
rm -rf Kivy*
"
@ -25,7 +25,6 @@ script "install-p4a" do
interpreter "bash"
code "
git clone git://github.com/kivy/python-for-android
chown -R vagrant:vagrant python-for-android
cd python-for-android
git checkout ca369d774e2
"

7
config.sample.py
View File

@ -30,13 +30,6 @@ gradle_plugin = "0.6.+"
# This corresponds to 72x72 pixels, i.e. mdpi
icon_max_size = 72
# Set the maximum age (in days) of an index that a client should accept from
# this repo. Setting it to 0 or not setting it at all disables this
# functionality. If you do set this to a non-zero value, you need to ensure
# that your index is updated much more frequently than the specified interval.
# The same policy is applied to the archive repo, if there is one.
repo_maxage = 0
repo_url = "https://f-droid.org/repo"
repo_name = "F-Droid"
repo_icon = "fdroid-icon.png"

10
fdroidserver/build.py
View File

@ -539,19 +539,13 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
bconfig = ConfigParser(defaults, allow_no_value=True)
bconfig.read(spec)
distdir = 'python-for-android/dist/fdroid'
if os.path.exists(distdir):
shutil.rmtree(distdir)
modules = bconfig.get('app', 'requirements').split(',')
cmd = 'ANDROIDSDK=' + config['sdk_path']
cmd += ' ANDROIDNDK=' + config['ndk_path']
cmd += ' ANDROIDNDKVER=r9'
cmd += ' ANDROIDAPI=' + str(bconfig.get('app', 'android.api'))
cmd += ' ./distribute.sh'
cmd += ' -m ' + "'" + ' '.join(modules) + "'"
cmd += ' -d fdroid'
cmd += ' -m ' + bconfig.get('app', 'requirements')
if subprocess.call(cmd, cwd='python-for-android', shell=True) != 0:
raise BuildException("Distribute build failed")
@ -583,7 +577,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
cmd.extend(['--icon', os.path.join(root_dir, icon)])
cmd.append('release')
p = FDroidPopen(cmd, cwd=distdir)
p = FDroidPopen(cmd, cwd='python-for-android/dist/default')
elif thisbuild.get('gradle', 'no') != 'no':
print "Building Gradle project..."

3
fdroidserver/common.py
View File

@ -61,8 +61,7 @@ def read_config(opts, config_file='config.py'):
'update_stats': False,
'archive_older': 0,
'max_icon_size': 72,
'stats_to_carbon': False,
'repo_maxage': 0
'stats_to_carbon': False
}
if options.verbose:
print "Reading %s..." % config_file

4
fdroidserver/update.py
View File

@ -467,15 +467,11 @@ def make_index(apps, apks, repodir, archive, categories):
repoel = doc.createElement("repo")
if archive:
repoel.setAttribute("name", config['archive_name'])
if config['repo_maxage'] != 0:
repoel.setAttribute("maxage", str(config['repo_maxage']))
repoel.setAttribute("icon", os.path.basename(config['archive_icon']))
repoel.setAttribute("url", config['archive_url'])
addElement('description', config['archive_description'], doc, repoel)
else:
repoel.setAttribute("name", config['repo_name'])
if config['repo_maxage'] != 0:
repoel.setAttribute("maxage", str(config['repo_maxage']))
repoel.setAttribute("icon", os.path.basename(config['repo_icon']))
repoel.setAttribute("url", config['repo_url'])
addElement('description', config['repo_description'], doc, repoel)