[xiph-cvs] cvs commit: win32sdk/sdk/build build_all.bat clean_dist.bat mkmak.bat
Chris Wolf
cwolf at xiph.org
Thu Oct 18 10:22:01 PDT 2001
cwolf 01/10/18 10:22:00
Modified: . README.win32sdk build_all.bat makesdk.bat
mfmacro.bat mkmak.bat
sdk/build build_all.bat clean_dist.bat mkmak.bat
Log:
Change scripts to support synchronous execution of all scripts from makesdk.bat
Revision Changes Path
1.6 +14 -38 win32sdk/README.win32sdk
Index: README.win32sdk
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/README.win32sdk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README.win32sdk 2001/09/15 08:56:12 1.5
+++ README.win32sdk 2001/10/18 17:21:59 1.6
@@ -1,4 +1,4 @@
-$Id: README.win32sdk,v 1.5 2001/09/15 08:56:12 cwolf Exp $
+$Id: README.win32sdk,v 1.6 2001/10/18 17:21:59 cwolf Exp $
$Name: $
win32sdk Readme, 13 September, 2001 Chris Wolf
@@ -18,50 +18,23 @@
cvs modules "ogg", "vorbis" and "win32sdk" (this module) are
required for this build.
- The script "mkmak.bat" must be run at least once to generate
- the makefiles.
-
- It will:
- 1.) create and install MSVC macros which allow performing an
- export of project makefiles and associated depenency files.
- The macro will then be invoked to generate the makefiles.
-
QUICK SUMMARY
-
- 1.) run clean_libs_mak.bat
- 2.) run mkmak.bat
- 3.) run clean_all.bat
- 4.) run makesdk.bat
- 5.) cd sdk\build
- 6.) run mkmak.bat
- 7.) run build_all.bat
- 8.) run run_tests.bat
-
-BUILDING
-
- To prepare the sdk for use, run "mkmak.bat", followed by "makesdk.bat".
- This script will:
+ 1.) run makesdk.bat
+ 2.) cd sdk\build
+ 3.) run build_all.bat
+ 4.) run run_tests.bat
- 1.) create "include", "lib", "bin", "doc" and "examples"
- directories and copy the required files from the dependent
- cvs modules (ogg and vorbis libraries).
- 2.) Using nmake, build the static and dynamic (DLL) libraries
- and copy them to the sdk\lib directory. This is accomplished
- in "makesdk.bat" by invoking the "build_all.bat" script.
+ If there are build problems, try the following three steps
+ before performing the above mentioned four steps.
- Note that the makefiles are generated from the IDE, and are thus a
- reflection of the workspace and project file states. It is strongly
- recommended to make changes via the IDE and export the makefiles,
- rather than tweaking the makefiles directly.
+ 1.) run clean_libs_mak.bat
+ 2.) run mkmak.bat
+ 3.) run clean_all.bat
- N.B. The script "mkmak.bat" invokes msdev using an automation macro;
- once invoked, the process runs in the background, so a sleep
- is added to make sure that all the makefiles are generated before
- the user attempts to run build_all.bat. Some slower machines
- may require more time.
+BUILDING
The following steps are optional. They are for building the libraries
in place. The purpose of this step is for libaray development under
@@ -109,5 +82,8 @@
mkmak.bat - creates makefiles and dependency files in the ogg and
vorbis modules.
+
+ mfmacro.bat - creates an MSVC macro used for makefile
+ generation from the command line.
sdk\build\mkmak.bat - creates makefiles for the example programs
1.7 +4 -3 win32sdk/build_all.bat
Index: build_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/build_all.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build_all.bat 2001/10/18 03:15:49 1.6
+++ build_all.bat 2001/10/18 17:21:59 1.7
@@ -1,5 +1,5 @@
@echo off
-rem $Id: build_all.bat,v 1.6 2001/10/18 03:15:49 cwolf Exp $
+rem $Id: build_all.bat,v 1.7 2001/10/18 17:21:59 cwolf Exp $
rem
rem Invoke as "build_all.bat CLEAN" to clean all targets
rem
@@ -11,8 +11,9 @@
rem Makefile generation is asychronous, so it cannot be
rem called inline with this script.
if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
- echo Error: must invoke "mkmak.bat" first
- goto done
+rem echo Error: must invoke "mkmak.bat" first
+rem goto done
+call mkmak.bat
)
if not exist %SRCROOT%\ogg\include\ogg\ogg.h goto noogg
1.12 +8 -4 win32sdk/makesdk.bat
Index: makesdk.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/makesdk.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- makesdk.bat 2001/10/18 03:26:33 1.11
+++ makesdk.bat 2001/10/18 17:21:59 1.12
@@ -1,19 +1,23 @@
@echo off
echo ---+++--- Making Win32 SDK ---+++---
rem
-rem $Id: makesdk.bat,v 1.11 2001/10/18 03:26:33 cwolf Exp $
+rem $Id: makesdk.bat,v 1.12 2001/10/18 17:21:59 cwolf Exp $
rem
if ."%SRCROOT%"==."" goto notset
if ."%MSDEVDIR%"==."" goto msdevnotset
+
+if not exist execwait.exe (
+ cl /nologo execwait.c
+)
+
rem If one of the makefiles doesn't exist,
rem assume they all need to be generated
rem
if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
- echo Error: must invoke "mkmak.bat" first
- goto exit
+ call mkmak.bat
)
rd /s /q sdk\include 2> nul
@@ -86,7 +90,7 @@
xcopy %SRCROOT%\vorbis\doc\vorbisfile\*.html %SRCROOT%\win32sdk\sdk\doc\vorbis\vorbisfile > nul
xcopy %SRCROOT%\vorbis\doc\vorbisfile\*.css %SRCROOT%\win32sdk\sdk\doc\vorbis\vorbisfile > nul
-copy sleep.js %SRCROOT%\win32sdk\sdk\build
+copy execwait.exe %SRCROOT%\win32sdk\sdk\build
echo ... copied.
1.6 +2 -3 win32sdk/mfmacro.bat
Index: mfmacro.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/mfmacro.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mfmacro.bat 2001/10/18 03:16:53 1.5
+++ mfmacro.bat 2001/10/18 17:21:59 1.6
@@ -1,5 +1,5 @@
@echo off
-rem $Id: mfmacro.bat,v 1.5 2001/10/18 03:16:53 cwolf Exp $
+rem $Id: mfmacro.bat,v 1.6 2001/10/18 17:21:59 cwolf Exp $
rem
rem Creates and installs VC macro for exporting makefiles from
rem the command line.
@@ -38,8 +38,7 @@
echo end Sub >> %macrofile%
set macrofile=
:enable
-call enableOggMacro.js
-call sleep.js 5
+execwait %SystemRoot%\system32\cscript.exe enableOggMacro.js
goto done
:notset
echo Error SRCROOT not set
1.6 +2 -7 win32sdk/mkmak.bat
Index: mkmak.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/mkmak.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mkmak.bat 2001/10/18 03:17:45 1.5
+++ mkmak.bat 2001/10/18 17:21:59 1.6
@@ -1,8 +1,6 @@
@echo off
-rem $Id: mkmak.bat,v 1.5 2001/10/18 03:17:45 cwolf Exp $
+rem $Id: mkmak.bat,v 1.6 2001/10/18 17:21:59 cwolf Exp $
rem
-rem This can't be called from the build script because
-rem it runs asychronously.
rem
if ."%SRCROOT%"==."" goto notset
@@ -13,12 +11,9 @@
rem If one of the makefiles doesn't exist,
rem assume they all need to be generated
rem
-rem sleep is required because msdev runs asynchronously
-rem
if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
echo Generating makefiles, please wait...
- msdev -ex ExportMakefile
- call sleep.js 10
+ execwait msdev -ex ExportMakefile
echo Done.
)
goto done
1.5 +16 -5 win32sdk/sdk/build/build_all.bat
Index: build_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/build_all.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build_all.bat 2001/10/18 03:18:56 1.4
+++ build_all.bat 2001/10/18 17:22:00 1.5
@@ -1,9 +1,21 @@
@echo off
-rem $Id: build_all.bat,v 1.4 2001/10/18 03:18:56 cwolf Exp $
+rem $Id: build_all.bat,v 1.5 2001/10/18 17:22:00 cwolf Exp $
rem
rem Invoke as "build_all.bat CLEAN" to clean all targets
rem
-if ."%SDKHOME%"==."" goto notset
+rem Once the SDK is replocated, make sure that the
+rem SDKHOME environment variable is reset to reflect
+rem the new location.
+rem
+if ."%SDKHOME%"==."" (
+ set SDKHOME="%SRCROOT%\win32sdk\sdk"
+ if not exist execwait.exe copy "%SRCROOT%\win32sdk\execwait.exe" .
+)
+
+if not exist execwait.exe (
+ echo No "execwait.exe" -- was win32sdk\makesdk.bat run?
+ goto nolib
+)
if not exist %SDKHOME%\lib\ogg.lib goto nolib
@@ -11,8 +23,7 @@
rem assume they all need to be generated
rem
if not exist %SDKHOME%\build\examples.mak (
- echo Must run "mkmak.bat" first...
- goto done
+ call mkmak.bat
)
nmake /nologo /f encoder.mak CFG="encoder - Win32 Debug" %1
@@ -39,7 +50,7 @@
goto done
:nolib
-echo ***** SDK needs to be built first, run win32sdk\maksdk.bat
+echo ***** SDK needs to be built first, run win32sdk\makesdk.bat
goto done
:notset
1.4 +2 -3 win32sdk/sdk/build/clean_dist.bat
Index: clean_dist.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/clean_dist.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clean_dist.bat 2001/10/18 03:19:15 1.3
+++ clean_dist.bat 2001/10/18 17:22:00 1.4
@@ -1,5 +1,5 @@
@echo off
-rem $Id: clean_dist.bat,v 1.3 2001/10/18 03:19:15 cwolf Exp $
+rem $Id: clean_dist.bat,v 1.4 2001/10/18 17:22:00 cwolf Exp $
rem
rd /s /q Debug\ 2> nul
rd /s /q Release\ 2> nul
@@ -9,5 +9,4 @@
del *.ncb 2> nul
del out.ogg 2> nul
del out.pcm 2> nul
-del sleep.bat 2> nul
-del sleep.js 2> nul
+del execwait.exe 2> nul
1.4 +2 -5 win32sdk/sdk/build/mkmak.bat
Index: mkmak.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/mkmak.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mkmak.bat 2001/10/18 03:25:03 1.3
+++ mkmak.bat 2001/10/18 17:22:00 1.4
@@ -1,8 +1,6 @@
@echo off
-rem $Id: mkmak.bat,v 1.3 2001/10/18 03:25:03 cwolf Exp $
+rem $Id: mkmak.bat,v 1.4 2001/10/18 17:22:00 cwolf Exp $
rem
-rem This can't be called from the build script because
-rem it runs asychronously.
rem
if ."%SDKHOME%"==."" goto notset
@@ -11,8 +9,7 @@
rem
if not exist %SDKHOME%\build\examples.mak (
echo Generating makefiles, please wait...
- msdev -ex ExportExampleMakefiles
- call sleep.js 5
+ execwait msdev -ex ExportExampleMakefiles
echo Done.
)
goto done
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list