[Gd-chatter] r11628 - trunk/fundev/admin/builds

hannes at gwydiondylan.org hannes at gwydiondylan.org
Wed Jan 16 00:14:12 CET 2008 

Author: hannes
Date: Wed Jan 16 00:14:11 2008
New Revision: 11628

Modified:
   trunk/fundev/admin/builds/Makefile
   trunk/fundev/admin/builds/build-release.bat
   trunk/fundev/admin/builds/run-test.bat
Log:
Job: minor
some updates to these files... libraries have been moved around, etc.

Modified: trunk/fundev/admin/builds/Makefile
==============================================================================
--- trunk/fundev/admin/builds/Makefile	(original)
+++ trunk/fundev/admin/builds/Makefile	Wed Jan 16 00:14:11 2008
@@ -276,7 +276,7 @@
 SYSTEM_TESTS_SOURCE = $(SYSTEM_DIRECTORY)\tests
 T_LISTS_SOURCE = $(LIB_DIRECTORY)\t-lists
 TEST_APPS_SOURCE = $(QA_DIRECTORY)\test-apps
-TEST_REPORT_SOURCE = $(QA_DIRECTORY)\test-report
+TESTWORKS_REPORT_SOURCE = $(QA_DIRECTORY)\testworks-report
 TEST_SUITES_SOURCE = $(QA_DIRECTORY)\test-suites
 TESTWORKS_SOURCE = $(QA_DIRECTORY)\testworks
 TESTWORKS_TESTS_SOURCE = $(TESTWORKS_SOURCE)\tests
@@ -406,7 +406,7 @@
 MAP_STATISTICS = $(INSTALL_BIN_DIRECTORY)\map-statistics.exe
 PARSER_COMPILER = $(INSTALL_BIN_DIRECTORY)\parser-compiler.exe
 PENTIUM_DW = $(INSTALL_BIN_DIRECTORY)\pentium-dw.exe
-TEST_REPORT = $(INSTALL_BIN_DIRECTORY)\test-report.exe
+TESTWORKS_REPORT = $(INSTALL_BIN_DIRECTORY)\testworks-report.exe
 WIN32_ENVIRONMENT = $(INSTALL_BIN_DIRECTORY)\win32-environment.exe
 WITH_SPLASH_SCREEN = $(INSTALL_BIN_DIRECTORY)\with-splash-screen.exe
 
@@ -842,7 +842,7 @@
 map-statistics: $(MAP_STATISTICS)
 parser-compiler: $(PARSER_COMPILER)
 pentium-dw: $(PENTIUM_DW)
-test-report: $(TEST_REPORT)
+testworks-report: $(TESTWORKS_REPORT)
 
 project-manager-libraries: tools-interface user-projects
 core-compiler-libraries: file-source-records release-info dood metering binary-manager coff-manager binary-builder coff-builder build-system parser-run-time dfmc-management dfmc-browser-support project-manager-libraries dfmc-execution dfmc-debug-back-end
@@ -1211,7 +1211,7 @@
 internal-libraries: enhanced-libraries midi
 internal-example-projects: enhanced-example-projects
 install-internal-examples: install-enhanced-examples install-midi-examples
-internal-only-tools: testworks-libraries test-report debugger map-statistics parser-compiler # hd2c interpreter
+internal-only-tools: testworks-libraries testworks-report debugger map-statistics parser-compiler # hd2c interpreter
 internal-tools: enhanced-tools internal-only-tools
 internal-release: release-info console-compiler compiler internal-environment internal-libraries internal-tools install-runtime-dlls install-internal-examples
 
@@ -1721,10 +1721,10 @@
   $(ENSURE_DIRECTORY) $(QA_DIRECTORY)
   $(CHECKOUT) test-apps fundev/Sources/qa/test-apps $(TEST_APPS_SOURCE)
 
-checkout-test-report:
+checkout-testworks-report:
   $(ENSURE_RELEASE_AREA)
   $(ENSURE_DIRECTORY) $(QA_DIRECTORY)
-  $(CHECKOUT) test-report fundev/Sources/qa/test-report $(TEST_REPORT_SOURCE)
+  $(CHECKOUT) testworks-report fundev/Sources/qa/testworks-report $(TESTWORKS_REPORT_SOURCE)
 
 checkout-test-suites:
   $(ENSURE_RELEASE_AREA)
@@ -2277,9 +2277,9 @@
   $(ENSURE_RUNTIME_LIBRARY) $(IO_DLL) io
   $(ENSURE_RUNTIME_LIBRARY) $(SYSTEM_DLL) system
   $(ENSURE_SOURCES) databases $(DATABASES_SOURCE)
-  $(ENSURE_REGISTRY_ENTRY) sql x86-win32
+  $(ENSURE_REGISTRY_ENTRY) sql generic
   $(ENSURE_REGISTRY_ENTRY) odbc-ffi x86-win32
-  $(ENSURE_REGISTRY_ENTRY) sql-odbc x86-win32
+  $(ENSURE_REGISTRY_ENTRY) sql-odbc generic
   $(BUILD_RUNTIME_LIBRARY) sql-odbc $(SQL_ODBC_DLL)
 
 #
@@ -2289,13 +2289,13 @@
 $(TESTWORKS):
   $(ENSURE_RUNTIME_LIBRARY) $(FUNCTIONAL_DYLAN_DLL) functional-dylan
   $(ENSURE_SOURCES) testworks $(TESTWORKS_SOURCE)
-  $(ENSURE_REGISTRY_ENTRY) testworks x86-win32
+  $(ENSURE_REGISTRY_ENTRY) testworks generic
   $(BUILD_RUNTIME_LIBRARY) testworks $(TESTWORKS_DLL)
 
 $(TESTWORKS_SPECS):
   $(ENSURE_RUNTIME_LIBRARY) $(TESTWORKS_DLL) testworks
   $(ENSURE_SOURCES) testworks-specs $(TESTWORKS_SPECS_SOURCE)
-  $(ENSURE_REGISTRY_ENTRY) testworks-specs x86-win32
+  $(ENSURE_REGISTRY_ENTRY) testworks-specs generic
   $(BUILD_RUNTIME_LIBRARY) testworks-specs $(TESTWORKS_SPECS_DLL)
 
 $(GUI_TESTWORKS):
@@ -3138,14 +3138,14 @@
   $(ENSURE_REGISTRY_ENTRY) map-statistics x86-win32
   $(BUILD_APPLICATION) map-statistics
 
-$(TEST_REPORT):
+$(TESTWORKS_REPORT):
   $(ENSURE_RUNTIME_LIBRARY) $(FUNCTIONAL_DYLAN_DLL) functional-dylan
   $(ENSURE_RUNTIME_LIBRARY) $(IO_DLL) io
   $(ENSURE_RUNTIME_LIBRARY) $(SYSTEM_DLL) system
   $(ENSURE_RUNTIME_LIBRARY) $(TESTWORKS_DLL) testworks
-  $(ENSURE_SOURCES) test-report $(TEST_REPORT_SOURCE)
-  $(ENSURE_REGISTRY_ENTRY) test-report generic
-  $(BUILD_APPLICATION) test-report
+  $(ENSURE_SOURCES) testworks-report $(TESTWORKS_REPORT_SOURCE)
+  $(ENSURE_REGISTRY_ENTRY) testworks-report generic
+  $(BUILD_APPLICATION) testworks-report
 
 # Basic Release
 
@@ -3509,7 +3509,7 @@
   $(ENSURE_RUNTIME_LIBRARY) $(SQL_ODBC_DLL) sql-odbc
   $(ENSURE_RUNTIME_LIBRARY) $(TESTWORKS_DLL) testworks
   $(ENSURE_SOURCES) databases $(DATABASES_SOURCE)
-  $(ENSURE_REGISTRY_ENTRY) sql-odbc-test x86-win32
+  $(ENSURE_REGISTRY_ENTRY) sql-odbc-test generic
   $(BUILD_APPLICATION) sql-odbc-test
 
 test-odbc:

Modified: trunk/fundev/admin/builds/build-release.bat
==============================================================================
--- trunk/fundev/admin/builds/build-release.bat	(original)
+++ trunk/fundev/admin/builds/build-release.bat	Wed Jan 16 00:14:11 2008
@@ -510,6 +510,7 @@
 xcopy /E /I %USER_REGISTRY%\x86-win32 %OPEN_DYLAN_USER_REGISTRIES%\x86-win32 >nul
 
 echo Removing runtime registry entries
+del "%OPEN_DYLAN_USER_REGISTRIES%\generic\unix-portability" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\unix-portability" 2>nul
 del "%OPEN_DYLAN_USER_REGISTRIES%\generic\dylan" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\dylan" 2>nul
 del "%OPEN_DYLAN_USER_REGISTRIES%\generic\functional-extensions" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\functional-extensions" 2>nul
 del "%OPEN_DYLAN_USER_REGISTRIES%\generic\machine-word" "%OPEN_DYLAN_USER_REGISTRIES%\x86-win32\machine-word" 2>nul

Modified: trunk/fundev/admin/builds/run-test.bat
==============================================================================
--- trunk/fundev/admin/builds/run-test.bat	(original)
+++ trunk/fundev/admin/builds/run-test.bat	Wed Jan 16 00:14:11 2008
@@ -43,12 +43,12 @@
 set TEST_NAME=%TEST_APP%
 goto find_test_report
 
-:FIND_TEST_REPORT
-call ensure-application test-report
-set TEST_REPORT=%OPEN_DYLAN_USER_INSTALL%\bin\test-report.exe
-if exist "%TEST_REPORT%" goto setup_variables
-set TEST_REPORT=%DYLAN_RELEASE_ROOT%\bin\test-report.exe
-if not exist "%TEST_REPORT%" goto no_test_report
+:FIND_TESTWORKS_REPORT
+call ensure-application testworks-report
+set TESTWORKS_REPORT=%OPEN_DYLAN_USER_INSTALL%\bin\testworks-report.exe
+if exist "%TESTWORKS_REPORT%" goto setup_variables
+set TESTWORKS_REPORT=%DYLAN_RELEASE_ROOT%\bin\testworks-report.exe
+if not exist "%TESTWORKS_REPORT%" goto no_test_report
 
 :SETUP_VARIABLES
 set LOG_NAME=test-%TEST_NAME%.log
@@ -82,17 +82,17 @@
 if not exist "%OLD_LOG%" goto log_report
 
 :COMPARE_LOGS
-if "%QUIET%"=="no" echo Running: %TEST_REPORT% /quiet %LOG% %OLD_LOG%
-%TEST_REPORT% /quiet %LOG% %OLD_LOG% > %REPORT_LOG%
+if "%QUIET%"=="no" echo Running: %TESTWORKS_REPORT% /quiet %LOG% %OLD_LOG%
+%TESTWORKS_REPORT% /quiet %LOG% %OLD_LOG% > %REPORT_LOG%
 if %ERRORLEVEL% NEQ 0 goto test_report_diff_failed
-if "%QUIET%"=="no" echo Running: %TEST_REPORT% %LOG% %OLD_LOG% -report summary
-%TEST_REPORT% %LOG% %OLD_LOG% -report summary
+if "%QUIET%"=="no" echo Running: %TESTWORKS_REPORT% %LOG% %OLD_LOG% -report summary
+%TESTWORKS_REPORT% %LOG% %OLD_LOG% -report summary
 if %ERRORLEVEL% NEQ 0 goto test_report_failed
 goto success
 
 :LOG_REPORT
-if "%QUIET%"=="no" echo Running: %TEST_REPORT% /quiet %LOG% -report summary
-%TEST_REPORT% /quiet %LOG% -report summary
+if "%QUIET%"=="no" echo Running: %TESTWORKS_REPORT% /quiet %LOG% -report summary
+%TESTWORKS_REPORT% /quiet %LOG% -report summary
 if %ERRORLEVEL% NEQ 0 goto test_report_failed
 goto success
 
@@ -118,16 +118,16 @@
 echo [see log %LOG%]
 goto generate_error
 
-:NO_TEST_REPORT
-echo test-report.exe wasn't found
+:NO_TESTWORKS_REPORT
+echo testworks-report.exe wasn't found
 goto generate_error
 
-:TEST_REPORT_FAILED
+:TESTWORKS_REPORT_FAILED
 echo Test Report failed (status code %ERRORLEVEL%)
 echo [see log %REPORT_LOG%]
 goto generate_error
 
-:TEST_REPORT_DIFF_FAILED
+:TESTWORKS_REPORT_DIFF_FAILED
 echo Test Report difference failed (status code %ERRORLEVEL%)
 echo [see log %REPORT_LOG%]
 goto generate_error

More information about the chatter mailing list