Просмотр исходного кода

* Port [3122] to 1.2.13
* Update build tools to symlink -current.tar.gz and -base.tar.gz on server side.


svn: 3124

Bryan Drewery 19 лет назад
Родитель
Сommit
9da1bf8e82
2 измененных файлов с 12 добавлено и 2 удалено
  1. 6 0
      build
  2. 6 2
      misc/buildall

+ 6 - 0
build

@@ -206,6 +206,12 @@ if [ $nopkg = "0" -o $pkg = "1" ]; then
   if ! [ $scp = 0 ]; then
     chmod 0700 misc/id_dsa
     scp -i misc/id_dsa -B -p -C ${PACKNAME}.$os-$ver${d}.tar.${ext} $scp
+
+    scp_target=`echo $scp | cut -d : -f 1`
+    dir=`echo $scp | cut -d : -f 2`
+    ssh -i misc/id_dsa $scp_target ln -fs ${dir}/${PACKNAME}.$os-$ver${d}.tar.${ext} ${dir}/${PACKNAME}.${os}-current.tar.gz
+    ssh -i misc/id_dsa $scp_target ln -fs ${dir}/${PACKNAME}.$os-$ver${d}.tar.${ext} ${dir}/${PACKNAME}.${os}-base.tar.gz
+
   fi
 elif ! [ $scp = "0" ]; then
   cp wraith wraith.$os-$ver${d} > /dev/null 2>&1

+ 6 - 2
misc/buildall

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+scp_target="bdrewery@endurance.quadspeedi.net"
+dir="public_html/builds"
+
 if test $# -lt 1; then
  echo "Usage: $0 directory"
  exit 1
@@ -14,9 +17,10 @@ for cfg in $cfgs
 do
  if test "`grep 'PACKNAME' $cfg`x" != "x"; then
   #Dont compile, just package up and dont rm old binaries.
-  ./build -n -P -q $cfg -s bdrewery@endurance.quadspeedi.net:public_html/builds/ all
+  ./build -n -P -q $cfg -s $scp_target:${dir}/ all
  fi
 done
 chmod 0700 misc/id_dsa
-ssh -i misc/id_dsa bdrewery@endurance.quadspeedi.net chmod 0644 public_html/builds/*.tar.gz
+ssh -i misc/id_dsa $scp_target chmod 0644 ${dir}/*.tar.gz
 rm *.tar.gz
+