Author: wade
Date: 2005-11-21 16:28:13 -0500 (Mon, 21 Nov 2005)
New Revision: 53324
Added:
trunk/release/website/packaging.css
Modified:
trunk/release/packaging/upload-prod
trunk/release/website/groups
trunk/release/website/mk-index.sh
trunk/release/website/mk-sources.sh
trunk/release/website/sources
Log:
-Generate pages based on version for the history views and downloads
for go-mono.com (mk-index and mk-sources)
./upload-prod now requires a version
Don't generate repo info or zip files for archive versions
-Consolidate the stylesheet into packaging.css
-Generate links to spec files if they exist (which will in the future)
-Fix bug so pages for USE_ZIP_PKG don't get generated (mk-index)
Modified: trunk/release/packaging/upload-prod
===================================================================
--- trunk/release/packaging/upload-prod 2005-11-21 20:45:14 UTC (rev 53323)
+++ trunk/release/packaging/upload-prod 2005-11-21 21:28:13 UTC (rev 53324)
@@ -1,13 +1,18 @@
#!/bin/sh
-DRYRUN=$1
+VERSION=$1
+DRYRUN=$2
-if [ ! -z $DRYRUN ]; then
+if test x$VERSION = x || test x$VERSION = xdry ; then
+ echo "Usage: ./upload-prod <version> [<dry>]"
+ exit 1
+fi
+
+if test x$DRYRUN = xdry ; then
extra_options=n
echo "Doing dry run..."
fi
-
cd packages
rsync -Cavz$extra_options -e ssh . [EMAIL PROTECTED]:go-mono/download
cd ../sources
@@ -25,9 +30,10 @@
if [ -z $DRYRUN ]; then
- ssh [EMAIL PROTECTED] "release/website/mk-index.sh
~/go-mono/download/"
+ ssh [EMAIL PROTECTED] "cp -f release/website/packaging.css ~/go-mono/"
+ ssh [EMAIL PROTECTED] "release/website/mk-sources.sh ~/go-mono/sources/
$VERSION"
+ ssh [EMAIL PROTECTED] "release/website/mk-index.sh
~/go-mono/download/ $VERSION"
ssh [EMAIL PROTECTED] "release/website/mk-oc.sh
~/go-mono/download/ official"
- ssh [EMAIL PROTECTED] "release/website/mk-sources.sh ~/go-mono/sources/"
fi
Modified: trunk/release/website/groups
===================================================================
--- trunk/release/website/groups 2005-11-21 20:45:14 UTC (rev 53323)
+++ trunk/release/website/groups 2005-11-21 21:28:13 UTC (rev 53324)
@@ -1,80 +1,7 @@
<html>
-<head><title></title>
-<style type="text/css">
-h1 {
- color: #efefef;
- font-size: 14pt;
- font-family: "Trebuchet MS";
-
- border: 0;
-
- margin: 0;
-
- padding: 1em;
-
- background: #777777;
-}
-
-h2, h4, h5, h6 {
- font-family: Verdana,sans-serif;
- font-weight: bold;
-}
-
-h3, h4, h5, h5 {
- margin-left: 1em;
-}
-
-h2, h3 {
- font-size: 18px;
-}
-
-h2 {
- padding: 3px;
- color: #000000;
- border-bottom: 2px solid #dddddd;
-}
-
-h3 {
- font-size: 13px;
- border-bottom: 2px solid #dddddd;
-}
-
-body {
- background-color: white;
- font-family: Verdana, sans-serif; font-size: 12px;
- color: black;
- margin: 0;
- padding: 0;
- border: 0;
-}
-
-td, p,lu,li {
-
- font-size: 12px;
- margin-left: 2em;
- margin-right: 2em;
-}
-
-img {
- border: 0;
- vertical-align: top;
-}
-.shell, .code-xml, .code-csharp
-{
- margin-left: 3em;
- margin-right: 3em;
- padding-left: 1em;
- padding-right: 1em;
- font-size: small;
- font-family: "Courier New", Courier;
- background:whitesmoke;
- border: solid 1px silver;
- line-height:110%;
-}
-
-</style>
-
- <title>Mono Downloads -- [[arch]]</title>
+<head>
+<link rel="stylesheet" href="/packaging.css" type="text/css">
+<title>Mono Downloads -- [[arch]]</title>
</head>
<body>
<h1>Mono Downloads -- [[arch]]</h1>
Modified: trunk/release/website/mk-index.sh
===================================================================
--- trunk/release/website/mk-index.sh 2005-11-21 20:45:14 UTC (rev 53323)
+++ trunk/release/website/mk-index.sh 2005-11-21 21:28:13 UTC (rev 53324)
@@ -5,30 +5,38 @@
. $packagingdir/shared-code.sh
-
WEB_DIR=$1
+VERSION=$2
+if test x$VERSION = x; then
+ echo "Usage: mk-index.sh <web_dir> <version>"
+ exit 1
+fi
+
cd $WEB_DIR
for distro_conf in $packagingdir/conf/*-*-*; do
# Skip the distros that use zip packaging system
- ! egrep "^USE_ZIP_PKG" $packagingdir/conf/$distro_conf > /dev/null 2>&1
|| continue
+ ! egrep "^USE_ZIP_PKG" $distro_conf > /dev/null 2>&1 || continue
distro_info `basename $distro_conf`
mkdir -p $DISTRO
+ mkdir -p $WEB_DIR/../archive/$VERSION/download/$DISTRO
OUT=$DISTRO/index.html
-
+ HISTORY_OUT=$WEB_DIR/../archive/$VERSION/download/$DISTRO/index.html
rm -rf $OUT
+ rm -rf $HISTORY_OUT
cat $confdir/groups | while read line
do
if [ "x${line:0:1}" == "x#" ]; then
ARGS=(${line:1})
RPMS=()
+ SPECS=()
for package in [EMAIL PROTECTED]:1}; do
. $packagingdir/defs/$package
@@ -41,10 +49,18 @@
[[ $i == *.src.rpm ]] && continue
RPMS=([EMAIL PROTECTED] $i)
done
+
+ for i in $LATEST_VERSION/*.spec; do
+ if [ -e $i ] ; then
+ SPECS=([EMAIL PROTECTED] $i)
+ fi
+ done
+
done
if [ [EMAIL PROTECTED] -eq 0 ]; then
echo "<p>Not available for this platform</p>"
>> $OUT
+ echo "<p>Not available for this platform</p>"
>> $HISTORY_OUT
continue
fi
@@ -54,24 +70,48 @@
# rpms are compressed anyways -- doing any compression
is a waste of time
zip -j -0 $DISTRO/$zipname.zip [EMAIL PROTECTED]
- echo "<p><a href='$zipname.zip'><img
src='/zip-icon.png' />All of these files in a ZIP file</a></p>" >> $OUT
+ echo "<p><a href='$zipname.zip'><img
src='/zip-icon.png' />All of these RPMs in a ZIP file</a></p>" >> $OUT
echo "<ul>" >> $OUT
+ echo "<ul>" >> $HISTORY_OUT
for i in [EMAIL PROTECTED]; do
NAME=$(rpm_query NAME $i)
DESC=$(rpm_query SUMMARY $i)
echo "<li><a href='../$i'>$NAME</a> --
$DESC</li>" >> $OUT
+ echo "<li><a
href='../../../../download/$i'>$NAME</a> -- $DESC</li>" >> $HISTORY_OUT
done
echo "</ul>" >> $OUT
+ echo "</ul>" >> $HISTORY_OUT
+
+ # Print links to spec files
+ if [ [EMAIL PROTECTED] -eq 0 ]; then
+ continue
+ fi
+
+ echo "<p>RPM Spec files: " >> $OUT
+ echo "<p>RPM Spec files: " >> $HISTORY_OUT
+ for i in [EMAIL PROTECTED]; do
+ NAME=$(basename $i)
+ echo "<a href='../$i'>$NAME</a> " >> $OUT
+ echo "<a
href='../../../../download/$i'>$NAME</a> " >> $HISTORY_OUT
+ done
+ echo "</p>" >> $OUT
+ echo "</p>" >> $HISTORY_OUT
+
elif [ "x${line:0:1}" == "x!" ]; then
line=$(echo ${line:1})
. $confdir/$line >> $OUT
-
+
+ # Don't display repository information for history pages
+ if test x$line != xget_rpm_install ; then
+ . $confdir/$line >> $HISTORY_OUT
+ fi
else
echo ${line//\\[\\[arch\\]\\]/$(basename $distro_conf)}
>> $OUT
+ echo ${line//\\[\\[arch\\]\\]/$(basename $distro_conf)}
>> $HISTORY_OUT
fi
done
done
Modified: trunk/release/website/mk-sources.sh
===================================================================
--- trunk/release/website/mk-sources.sh 2005-11-21 20:45:14 UTC (rev 53323)
+++ trunk/release/website/mk-sources.sh 2005-11-21 21:28:13 UTC (rev 53324)
@@ -5,10 +5,22 @@
. $packagingdir/shared-code.sh
WEB_DIR=$1
+VERSION=$2
+if test x$VERSION = x; then
+ echo "Usage: mk-sources.sh <web_dir> <version>"
+ exit 1
+fi
+
+
+# Also generate a sources index for archive history
+mkdir -p $WEB_DIR/../archive/$VERSION/sources
+
cd $WEB_DIR
OUT=index.html
-rm $OUT
+HISTORY_OUT=../archive/$VERSION/sources/index.html
+rm -f $OUT
+rm -f $HISTORY_OUT
cat $confdir/sources | while read line
do
@@ -27,13 +39,17 @@
done
echo [EMAIL PROTECTED]
echo "<ul>" >> $OUT
+ echo "<ul>" >> $HISTORY_OUT
for i in [EMAIL PROTECTED]; do
n=$(basename $i)
echo "<li><a href='$i'>$n</a></li>" >> $OUT
+ echo "<li><a href='../../../sources/$i'>$n</a></li>" >>
$HISTORY_OUT
done
echo "</ul>" >> $OUT
+ echo "</ul>" >> $HISTORY_OUT
else
echo ${line} >> $OUT
+ echo ${line} >> $HISTORY_OUT
fi
done
Added: trunk/release/website/packaging.css
===================================================================
--- trunk/release/website/packaging.css 2005-11-21 20:45:14 UTC (rev 53323)
+++ trunk/release/website/packaging.css 2005-11-21 21:28:13 UTC (rev 53324)
@@ -0,0 +1,71 @@
+h1 {
+ color: #efefef;
+ font-size: 14pt;
+ font-family: "Trebuchet MS";
+
+ border: 0;
+
+ margin: 0;
+
+ padding: 1em;
+
+ background: #777777;
+}
+
+h2, h4, h5, h6 {
+ font-family: Verdana,sans-serif;
+ font-weight: bold;
+}
+
+h3, h4, h5, h5 {
+ margin-left: 1em;
+}
+
+h2, h3 {
+ font-size: 18px;
+}
+
+h2 {
+ padding: 3px;
+ color: #000000;
+ border-bottom: 2px solid #dddddd;
+}
+
+h3 {
+ font-size: 13px;
+ border-bottom: 2px solid #dddddd;
+}
+
+body {
+ background-color: white;
+ font-family: Verdana, sans-serif; font-size: 12px;
+ color: black;
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+
+td, p,lu,li {
+
+ font-size: 12px;
+ margin-left: 2em;
+ margin-right: 2em;
+}
+
+img {
+ border: 0;
+ vertical-align: top;
+}
+.shell, .code-xml, .code-csharp
+{
+ margin-left: 3em;
+ margin-right: 3em;
+ padding-left: 1em;
+ padding-right: 1em;
+ font-size: small;
+ font-family: "Courier New", Courier;
+ background:whitesmoke;
+ border: solid 1px silver;
+ line-height:110%;
+}
+
Modified: trunk/release/website/sources
===================================================================
--- trunk/release/website/sources 2005-11-21 20:45:14 UTC (rev 53323)
+++ trunk/release/website/sources 2005-11-21 21:28:13 UTC (rev 53324)
@@ -1,80 +1,7 @@
<html>
-<head><title></title>
-<style type="text/css">
-h1 {
- color: #efefef;
- font-size: 14pt;
- font-family: "Trebuchet MS";
-
- border: 0;
-
- margin: 0;
-
- padding: 1em;
-
- background: #777777;
-}
-
-h2, h4, h5, h6 {
- font-family: Verdana,sans-serif;
- font-weight: bold;
-}
-
-h3, h4, h5, h5 {
- margin-left: 1em;
-}
-
-h2, h3 {
- font-size: 18px;
-}
-
-h2 {
- padding: 3px;
- color: #000000;
- border-bottom: 2px solid #dddddd;
-}
-
-h3 {
- font-size: 13px;
- border-bottom: 2px solid #dddddd;
-}
-
-body {
- background-color: white;
- font-family: Verdana, sans-serif; font-size: 12px;
- color: black;
- margin: 0;
- padding: 0;
- border: 0;
-}
-
-td, p,lu,li {
-
- font-size: 12px;
- margin-left: 2em;
- margin-right: 2em;
-}
-
-img {
- border: 0;
- vertical-align: top;
-}
-.shell, .code-xml, .code-csharp
-{
- margin-left: 3em;
- margin-right: 3em;
- padding-left: 1em;
- padding-right: 1em;
- font-size: small;
- font-family: "Courier New", Courier;
- background:whitesmoke;
- border: solid 1px silver;
- line-height:110%;
-}
-
-</style>
-
- <title>Mono Sources</title>
+<head>
+<link rel="stylesheet" href="/packaging.css" type="text/css">
+<title>Mono Sources</title>
</head>
<body>
<h1>Mono Sources</h1>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
