projects
/
moonshot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update for freeradius 3.0.4 and Trustrouter 1.3
[moonshot.git]
/
builder
diff --git
a/builder
b/builder
index
4f7e477
..
9a924ca
100755
(executable)
--- a/
builder
+++ b/
builder
@@
-69,8
+69,11
@@
def command_output(args) :
def build(package):
with current_directory(package):
try: os.makedirs( "m4")
def build(package):
with current_directory(package):
try: os.makedirs( "m4")
- except OsError: pass
- run_cmd(('autoreconf', '-i', '-f'))
+ except OSError: pass
+ #On Centos, freeradius produces an invalid configure script
+ # They check in a configure script anyway so we don't need autoconf
+ if package != "freeradius-server":
+ run_cmd(('autoreconf', '-i', '-f'))
configure_command = [
'./configure'] + configure_opts
if len(schroot_command) > 0:
configure_command = [
'./configure'] + configure_opts
if len(schroot_command) > 0:
@@
-83,7
+86,10
@@
def build(package):
try: os.mkdir('doc/api')
except: pass
#Currently freeradius's make dist is broken
try: os.mkdir('doc/api')
except: pass
#Currently freeradius's make dist is broken
- if not package == "freeradius-server":
+ if package == "freeradius-server":
+ run_cmd(root_command + " git archive --prefix=freeradius-server/ HEAD |gzip -9 >freeradius-server.tar.gz", shell=True)
+ run_cmd('cp *.tar.gz freeradius-server.spec ' +dist_dir, shell=True)
+ else: #not specially handled
run_cmd(root_command +' make dist-gzip', shell=True)
run_cmd('cp *.tar.gz ' +dist_dir, shell=True)
run_cmd(schroot_command + ' make -j3', shell=True)
run_cmd(root_command +' make dist-gzip', shell=True)
run_cmd('cp *.tar.gz ' +dist_dir, shell=True)
run_cmd(schroot_command + ' make -j3', shell=True)