diff --git a/post_upload.py b/post_upload.py index 487d0d9..c49f99f 100644 --- a/post_upload.py +++ b/post_upload.py @@ -22,9 +22,15 @@ if len(sys.argv) > 2 and sys.argv[2] == 'release': if len(sys.argv) > 3: release_version = sys.argv[3] +print "Post-upload running: suffix=" + suffix +print "are we doing an RC:" + str(isReleaseCandidate) + allSuffix = '*' + suffix print "Wildcard pattern is:" + allSuffix + +sys.stdout.flush() + pattern = r'\w+-(?P\d+)\.(?P\d+)\.(?P\d+)([\w-]*)' + suffix sourceForgeUserHost = "jmturner@frs.sourceforge.net" sftpCommandFile = "sftp-commands" @@ -122,7 +128,12 @@ for file in incomingFiles: # upload to SourceForge for file in newFiles: print "Uploading " + file + " to SourceForge" - call(["scp", file, sourceForgeUserHost + ":" + sourceForgePath + file]) + print "Skipped until SF FRS is fixed" +# sys.stdout.flush() +# call(["scp", "-v", file, sourceForgeUserHost + ":" + sourceForgePath + file]) +# call(["rsync", "-e", "ssh", file, sourceForgeUserHost + ":" + sourceForgePath + file]) +# print "...Done" + sys.stdout.flush() if sys.argv[1] == 'windows': print "Archiving PDB files" diff --git a/sync_to_SF_frs.sh b/sync_to_SF_frs.sh new file mode 100755 index 0000000..4d55cc9 --- /dev/null +++ b/sync_to_SF_frs.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +versionMajor=2018.3 +patchLevel=6 + +version=$versionMajor.$patchLevel + +echo "Moving RC for $version to SourceForge FRS" + +server=jmturner@frs.sourceforge.net +destination=/home/frs/project/f/fl/flightgear +source=/var/www/html/builds/rc +localDest=/var/www/html/builds/$versionMajor + +scp $source/FlightGear-$version-rc.dmg $server:$destination/release-$versionMajor/FlightGear-$version.dmg +scp $source/FlightGear-$version-rc.exe $server:$destination/release-$versionMajor/FlightGear-$version.exe + +scp $source/flightgear-$version-rc.tar.bz2 $server:$destination/release-$versionMajor/flightgear-$version.tar.bz2 +scp $source/simgear-$version-rc.tar.bz2 $server:$destination/release-$versionMajor/simgear-$version.tar.bz2 +scp $source/FlightGear-$version-data-rc.tar.bz2 $server:$destination/release-$versionMajor/FlightGear-$version-data.tar.bz2 + +cp $source/FlightGear-$version-rc.dmg $localDest/FlightGear-$version.dmg +cp $source/FlightGear-$version-rc.exe $localDest/FlightGear-$version.exe + +cp $source/flightgear-$version-rc.tar.bz2 $localDest/flightgear-$version.tar.bz2 +cp $source/simgear-$version-rc.tar.bz2 $localDest/simgear-$version.tar.bz2 +cp $source/FlightGear-$version-data-rc.tar.bz2 $localDest/FlightGear-$version-data.tar.bz2 + +echo "All done"