Răsfoiți Sursa

Flush

svn path=/trunk/mono/; revision=17814
Miguel de Icaza 22 ani în urmă
părinte
comite
a2636c011b
10 a modificat fișierele cu 42 adăugiri și 14 ștergeri
  1. 1 1
      doc/index
  2. 1 1
      doc/languages
  3. 3 2
      doc/web/makefile
  4. 12 3
      doc/web/mono-rss.cs
  5. 4 0
      doc/web/template.html.in
  6. 1 1
      web/index
  7. 1 1
      web/languages
  8. 3 2
      web/web/makefile
  9. 12 3
      web/web/mono-rss.cs
  10. 4 0
      web/web/template.html.in

+ 1 - 1
doc/index

@@ -439,7 +439,7 @@
 	that SourceGear Corporation will use Mono\x{2122} Project
 	technology to offer cross-platform versions of its
 	products. In addition, the companies have entered into a
-	development partnership under which Ximian® will provide
+	development partnership under which Ximian will provide
 	custom Mono development to enable delivery of SourceGear
 	products later this year. As a result, SourceGear will offer
 	both UNIX and Linux clients for its SourceGear Vault source

+ 1 - 1
doc/languages

@@ -111,7 +111,7 @@
         <a href="mailto:[email protected]">Brian Lloyd</a> is
 	working on linking the Python runtime with the .NET runtime.
 	More information on the PS.NET project can be found <a
-	href="http://www.zope.org/Members/Brian/PythonNet/index_html">here</a>.
+	href="http://www.zope.org/Members/Brian/PythonNet">here</a>.
 	An FAQ document is available <a
 	href="http://www.zope.org/Members/Brian/PythonNet/FAQ.html">here</a>.
 

+ 3 - 2
doc/web/makefile

@@ -112,8 +112,9 @@ clean:
 
 push:
 	cp -f $(NON_HTML_SOURCES) deploy
-	echo scp -P 2200 -r deploy/* [email protected]:/web/cvsmodules/mono
-	(cd deploy; rsync --verbose --recursive --checksum --update --rsh='ssh' . [email protected]:/web/cvsmodules/mono )
+	#echo scp -P 2200 -r deploy/* [email protected]:/web/cvsmodules/mono
+	#(cd deploy; rsync --verbose --recursive --checksum --update --rsh='ssh' . [email protected]:/web/cvsmodules/mono )
+	(cd deploy; rsync --verbose --recursive --checksum --update --rsh='ssh' . [email protected]:/web/cvsmodules/mono )
 
 push2: 
 	scp -r deploy/* primates:public_html/xxx

+ 12 - 3
doc/web/mono-rss.cs

@@ -6,18 +6,21 @@
 using System;
 using System.IO;
 using System.Xml;
+using System.Text;
 using RSS;
 
 class X {
 	static RSS.RSS rss;
 	static Channel c;
 	static int item_count;
-
+	static int line;
+	
 	static void PopulateRSS (StreamReader input)
 	{
 		string s;
 		
 		while ((s = input.ReadLine ()) != null){
+			line++;
 			if (s.StartsWith ("@item "))
 				break;
 		}
@@ -52,6 +55,7 @@ class X {
 			} else {
 				description += "\n" + (s == "\n" ? "<p>" : s);
 			}
+			line++;
 		} while ((s = input.ReadLine ()) != null);
 
 		if (i != null){
@@ -76,11 +80,16 @@ class X {
 
 		using (FileStream fs = new FileStream (input, FileMode.Open)){
 			using (StreamReader input_stream = new StreamReader (fs)){
-				PopulateRSS (input_stream);
+				try {
+					PopulateRSS (input_stream);
+				} catch {
+					Console.WriteLine ("{0} failure while loading: {1}", line, input);
+					throw;
+				}
 			}
 		}
 		
-		rss.XmlDocument.Save (output);
+		rss.XmlDocument.Save (output, new UTF8Encoding (false, false));
 	}
 	
 	static int Main (string [] args)

+ 4 - 0
doc/web/template.html.in

@@ -30,6 +30,10 @@
 	a.navi2:visited { color: #cccccc; }
 	a.navi2:hover { color: #ee9900; text-decoration: underline; }
 
+	a.topmenu { color: #ffffff; text-decoration: none; margin-left: 7px;}
+	a.topmenu:visited { color: #cccccc; }
+	a.topmenu:hover { color: #ee9900; text-decoration: underline; }
+
 // --> 
 </style>
 #CSS#

+ 1 - 1
web/index

@@ -439,7 +439,7 @@
 	that SourceGear Corporation will use Mono\x{2122} Project
 	technology to offer cross-platform versions of its
 	products. In addition, the companies have entered into a
-	development partnership under which Ximian® will provide
+	development partnership under which Ximian will provide
 	custom Mono development to enable delivery of SourceGear
 	products later this year. As a result, SourceGear will offer
 	both UNIX and Linux clients for its SourceGear Vault source

+ 1 - 1
web/languages

@@ -111,7 +111,7 @@
         <a href="mailto:[email protected]">Brian Lloyd</a> is
 	working on linking the Python runtime with the .NET runtime.
 	More information on the PS.NET project can be found <a
-	href="http://www.zope.org/Members/Brian/PythonNet/index_html">here</a>.
+	href="http://www.zope.org/Members/Brian/PythonNet">here</a>.
 	An FAQ document is available <a
 	href="http://www.zope.org/Members/Brian/PythonNet/FAQ.html">here</a>.
 

+ 3 - 2
web/web/makefile

@@ -112,8 +112,9 @@ clean:
 
 push:
 	cp -f $(NON_HTML_SOURCES) deploy
-	echo scp -P 2200 -r deploy/* [email protected]:/web/cvsmodules/mono
-	(cd deploy; rsync --verbose --recursive --checksum --update --rsh='ssh' . [email protected]:/web/cvsmodules/mono )
+	#echo scp -P 2200 -r deploy/* [email protected]:/web/cvsmodules/mono
+	#(cd deploy; rsync --verbose --recursive --checksum --update --rsh='ssh' . [email protected]:/web/cvsmodules/mono )
+	(cd deploy; rsync --verbose --recursive --checksum --update --rsh='ssh' . [email protected]:/web/cvsmodules/mono )
 
 push2: 
 	scp -r deploy/* primates:public_html/xxx

+ 12 - 3
web/web/mono-rss.cs

@@ -6,18 +6,21 @@
 using System;
 using System.IO;
 using System.Xml;
+using System.Text;
 using RSS;
 
 class X {
 	static RSS.RSS rss;
 	static Channel c;
 	static int item_count;
-
+	static int line;
+	
 	static void PopulateRSS (StreamReader input)
 	{
 		string s;
 		
 		while ((s = input.ReadLine ()) != null){
+			line++;
 			if (s.StartsWith ("@item "))
 				break;
 		}
@@ -52,6 +55,7 @@ class X {
 			} else {
 				description += "\n" + (s == "\n" ? "<p>" : s);
 			}
+			line++;
 		} while ((s = input.ReadLine ()) != null);
 
 		if (i != null){
@@ -76,11 +80,16 @@ class X {
 
 		using (FileStream fs = new FileStream (input, FileMode.Open)){
 			using (StreamReader input_stream = new StreamReader (fs)){
-				PopulateRSS (input_stream);
+				try {
+					PopulateRSS (input_stream);
+				} catch {
+					Console.WriteLine ("{0} failure while loading: {1}", line, input);
+					throw;
+				}
 			}
 		}
 		
-		rss.XmlDocument.Save (output);
+		rss.XmlDocument.Save (output, new UTF8Encoding (false, false));
 	}
 	
 	static int Main (string [] args)

+ 4 - 0
web/web/template.html.in

@@ -30,6 +30,10 @@
 	a.navi2:visited { color: #cccccc; }
 	a.navi2:hover { color: #ee9900; text-decoration: underline; }
 
+	a.topmenu { color: #ffffff; text-decoration: none; margin-left: 7px;}
+	a.topmenu:visited { color: #cccccc; }
+	a.topmenu:hover { color: #ee9900; text-decoration: underline; }
+
 // --> 
 </style>
 #CSS#