[ros-diffs] [dreimer] 33212: build.ps1 works now. makex not, because I did not find a way to get the number of cores yet.

dreimer at svn.reactos.org dreimer at svn.reactos.org
Thu May 1 16:24:40 CEST 2008


Author: dreimer
Date: Thu May  1 09:24:40 2008
New Revision: 33212

URL: http://svn.reactos.org/svn/reactos?rev=33212&view=rev
Log:
build.ps1 works now. makex not, because I did not find a way to get the number of cores yet.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1?rev=33212&r1=33211&r2=33212&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Thu May  1 09:24:40 2008
@@ -73,8 +73,8 @@
 #
 # Get the current date and time for use in in our build log's file name.
 #
-$DATENAME = get-date -f d
-$TIMENAME = get-date -f t
+$DATENAME = get-date -f dyMMyyyy
+$TIMENAME = get-date -f HHmm
 
 
 #
@@ -82,23 +82,25 @@
 # exists, if it doesn't, create it.
 #
 if ($_ROSBE_WRITELOG -eq 1) {
-    if (Test-Path "$_ROSBE_LOGDIR\.") {
-        mkdir "$_ROSBE_LOGDIR" 1> NUL 2> NUL
+    if (!(Test-Path "$_ROSBE_LOGDIR")) {
+        New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory
     }
 }
 
 function BUILD {
     if ($_ROSBE_SHOWTIME -eq 1) {
         if ($_ROSBE_WRITELOG -eq 1) {
-            """$_ROSBE_BASEDIR\Tools\buildtime.exe"" ""$_ROSBE_MINGWMAKE"" $args[0..5] 2>&1 | ""$_ROSBE_BASEDIR\Tools\tee.exe"" ""$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt"""
+            New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file
+            & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt"
         } else {
-            """$_ROSBE_BASEDIR\Tools\buildtime.exe"" ""$_ROSBE_MINGWMAKE"" $args[0..5]"
+            & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args)
         }
     } else {
         if ($_ROSBE_WRITELOG -eq 1) {
-            """$_ROSBE_MINGWMAKE"" $args[0..5] 2>&1 | ""$_ROSBE_BASEDIR\Tools\tee.exe"" ""$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt"""
+            New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file
+            & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt"
         } else {
-            """$_ROSBE_MINGWMAKE"" $args[0..5]"
+            & "$_ROSBE_MINGWMAKE" $($args)
         }
     }
 }
@@ -116,15 +118,17 @@
 
     if ($_ROSBE_SHOWTIME -eq 1) {
         if ($_ROSBE_WRITELOG -eq 1) {
-#            "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "$_ROSBE_BASEDIR\Tools\tee.exe" "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt"
+#            New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file
+#            & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt"
         } else {
-#            "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9
+#            & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args)
         }
     } else {
         if ($_ROSBE_WRITELOG -eq 1) {
-#            "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "$_ROSBE_BASEDIR\Tools\tee.exe" "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt"
+#            New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file
+#            & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt"
         } else {
-#            "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9
+#            & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args)
         }
     }
 }



More information about the Ros-diffs mailing list