------------------------------------------------------------ revno: 13142 revision-id: squidadm@squid-cache.org-20131121221203-806g8zb5yxx9f80n parent: rousskov@measurement-factory.com-20131121153636-hr7hdkk3d4pclk2s committer: Automatic source maintenance branch nick: trunk timestamp: Thu 2013-11-21 15:12:03 -0700 message: Source Maintenance: move 3.HEAD snapshot build to website scripts ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20131121221203-\ # 806g8zb5yxx9f80n # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 8173acc4d12c9d056c6084504fc1608f242b7fa8 # timestamp: 2013-11-21 22:53:41 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: rousskov@measurement-factory.com-20131121153636-\ # hr7hdkk3d4pclk2s # # Begin patch === modified file 'mksnapshot-cron.sh' --- mksnapshot-cron.sh 2013-07-22 09:22:09 +0000 +++ mksnapshot-cron.sh 2013-11-21 22:12:03 +0000 @@ -96,18 +96,18 @@ set +e # autotool derived files not kept in trunk, but still need to bootstrap for make dist -../commit/bootstrap squid-3 -make_snapshot ../commit/squid-3/mksnapshot.sh trunk v3 3.HEAD 6 - -rm -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new -cp ../commit/squid-3/CONTRIBUTORS /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new -chmod 444 /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new -mv -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new /server/httpd/htdocs/squid-cache.org/content/CONTRIBUTORS.txt - -rm -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new -cp ../commit/squid-3/SPONSORS /server/httpd/htdocs/squid-cache.org/SPONSORS.new -chmod 444 /server/httpd/htdocs/squid-cache.org/SPONSORS.new -mv -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new /server/httpd/htdocs/squid-cache.org/content/SPONSORS.txt +#../commit/bootstrap squid-3 +#make_snapshot ../commit/squid-3/mksnapshot.sh trunk v3 3.HEAD 6 + +#rm -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new +#cp ../commit/squid-3/CONTRIBUTORS /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new +#chmod 444 /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new +#mv -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new /server/httpd/htdocs/squid-cache.org/content/CONTRIBUTORS.txt +# +#rm -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new +#cp ../commit/squid-3/SPONSORS /server/httpd/htdocs/squid-cache.org/SPONSORS.new +#chmod 444 /server/httpd/htdocs/squid-cache.org/SPONSORS.new +#mv -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new /server/httpd/htdocs/squid-cache.org/content/SPONSORS.txt ../commit/bootstrap squid-3.4 make_snapshot ../commit/squid-3/mksnapshot.sh 3.4 v3 3.4 30