You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2007/10/22 21:11:37 UTC
svn commit: r587205 - /incubator/stdcxx/trunk/etc/config/windows/generate.wsf

Author: faridz
Date: Mon Oct 22 12:11:33 2007
New Revision: 587205

URL: http://svn.apache.org/viewvc?rev=587205&view=rev
Log:
2007-10-22 Farid Zaripov <fa...@epam.com>

	Merged r587201 from branches/4.2.x with a fix for STDCXX-609
	* generate.wsf (generateBuildBatch): Use 11s build type as default
	if no any build type specified.

Modified:
    incubator/stdcxx/trunk/etc/config/windows/generate.wsf

Modified: incubator/stdcxx/trunk/etc/config/windows/generate.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/generate.wsf?rev=587205&r1=587204&r2=587205&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/generate.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/generate.wsf Mon Oct 22 12:11:33 2007
@@ -397,13 +397,16 @@
         buildBatchFile.WriteLine("set builddir=" + buildDir);
         buildBatchFile.WriteLine("set scriptdir=etc\\config\\windows");
         buildBatchFile.WriteLine("set makelog=makelog.wsf");
-        buildBatchFile.WriteLine("set cfg=");
-        buildBatchFile.WriteLine("set cfgbrief=");
+        buildBatchFile.WriteLine("set cfg=11s Debug Static");
+        buildBatchFile.WriteLine("set cfgbrief=11s");
         buildBatchFile.WriteLine("set devenv=\"" + DEVENV + "\"");
         buildBatchFile.WriteLine("");
         
+        buildBatchFile.WriteLine("if \"%1\"==\"\" goto buildcfg");
+        buildBatchFile.WriteLine("");
+
         buildBatchFile.WriteLine(":cfgloop");
-        buildBatchFile.WriteLine("if \"%1\"==\"\" goto continue");
+        buildBatchFile.WriteLine("set cfg=");
         buildBatchFile.WriteLine("");
         
         for (var i = 0; i < confNames.length; ++i)
@@ -418,14 +421,15 @@
             buildBatchFile.WriteLine("");
         }
         
-        buildBatchFile.WriteLine("");
         buildBatchFile.WriteLine("if \"%cfg%\"==\"\" (");
-        buildBatchFile.WriteLine("echo Unknown configuration to build");
+        buildBatchFile.WriteLine("echo Unknown configuration to build: %1");
         buildBatchFile.WriteLine("set ERRORLEVEL=1");
         buildBatchFile.WriteLine("goto nextcfg");
         buildBatchFile.WriteLine(")");
         buildBatchFile.WriteLine("");
 
+        buildBatchFile.WriteLine(":buildcfg");
+        buildBatchFile.WriteLine("echo Building %cfg%...");
         buildBatchFile.WriteLine("cscript /nologo "
             + "\"%topdir%\\%scriptdir%\\build.wsf\""
             + " /BUILDDIR:\"%builddir%\" /TOPDIR:\"%topdir%\""
@@ -438,11 +442,11 @@
         
         buildBatchFile.WriteLine(":nextcfg");
         buildBatchFile.WriteLine("shift");
-        buildBatchFile.WriteLine("goto cfgloop");
+        buildBatchFile.WriteLine("if not \"%1\"==\"\" goto cfgloop");
         buildBatchFile.WriteLine("");
         
         buildBatchFile.WriteLine(":continue");
-        buildBatchFile.WriteLine("echo build complete");
+        buildBatchFile.WriteLine("echo Build complete");
         buildBatchFile.WriteLine("");
         
         buildBatchFile.Close();