[adobe-source-commits] adobe-source/adobe/bin make-distribution.bat,NONE,1.1 asl_net_setup.bat,1.6,1.7 asl_net_setup.sh,1.6,1.7 build.bat,1.6,1.7 build.sh,1.4,1.5 install.sh,1.2,1.3 verify.sh,1.3,1.4

[Foster B. <fos...@us...>]

Update of /cvsroot/adobe-source/adobe-source/adobe/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1031/adobe/bin

Modified Files:
	asl_net_setup.bat asl_net_setup.sh build.bat build.sh 
	install.sh verify.sh 
Added Files:
	make-distribution.bat 
Log Message:
asl 1.0.13

--- NEW FILE: make-distribution.bat ---
@ECHO OFF

SET DEBUG_DISTRO_PATH=distribution\x86\debug\Adobe Begin\
SET RELEASE_DISTRO_PATH=distribution\x86\release\Adobe Begin\
SET ARTIFACT_PATH=ide_projects\vc8\build\Win32\
SET VC8_DEFAULT_ROOT=%ProgramFiles%\Microsoft Visual Studio 8\

REM ### This will make the current directory to be that of the build script

PUSHD %~dp0
PUSHD ..\..\

IF NOT EXIST "%ARTIFACT_PATH%" (
	ECHO ### Error: You must first do a build of Adobe Begin using the MSVC 8 IDE projects before using this script.
	EXIT /B 1
)

IF NOT EXIST "%DEBUG_DISTRO_PATH%" (
	ECHO Making debug distribution directory
	MKDIR "%DEBUG_DISTRO_PATH%"
)
IF EXIST "%DEBUG_DISTRO_PATH%" (	
	ECHO Clearing out debug distribution directory
	DEL /F /Q "%DEBUG_DISTRO_PATH%*"
)

IF NOT EXIST "%RELEASE_DISTRO_PATH%" (
	ECHO Making release distribution directory
	MKDIR "%RELEASE_DISTRO_PATH%"
)
IF EXIST "%RELEASE_DISTRO_PATH%" (	
	ECHO Clearing out debug distribution directory
	DEL /F /Q "%RELEASE_DISTRO_PATH%*"
)

IF EXIST "%VC8_DEFAULT_ROOT%" (
	SET VC8_ROOT=%VC8_DEFAULT_ROOT%
)

IF "_%VC8_ROOT%_" == "__" (
	ECHO ### Error: Your installation of MSVC 8 is not in the default location, nor do you have a VC8_ROOT environment variable set.
	EXIT /B 1
)

CALL "%VC8_ROOT%VC\bin\VCVARS32.bat"

SET DEBUG_REDIST_DIR=%VCINSTALLDIR%\redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\
SET RELEASE_REDIST_DIR=%VCINSTALLDIR%\redist\x86\Microsoft.VC80.CRT\

COPY "%DEBUG_REDIST_DIR%Microsoft.VC80.DebugCRT.manifest" "%DEBUG_DISTRO_PATH%"
COPY "%DEBUG_REDIST_DIR%msvcm80d.dll" "%DEBUG_DISTRO_PATH%"
COPY "%DEBUG_REDIST_DIR%msvcp80d.dll" "%DEBUG_DISTRO_PATH%"
COPY "%DEBUG_REDIST_DIR%msvcr80d.dll" "%DEBUG_DISTRO_PATH%"

COPY "%RELEASE_REDIST_DIR%Microsoft.VC80.CRT.manifest" "%RELEASE_DISTRO_PATH%"
COPY "%RELEASE_REDIST_DIR%msvcm80.dll" "%RELEASE_DISTRO_PATH%"
COPY "%RELEASE_REDIST_DIR%msvcp80.dll" "%RELEASE_DISTRO_PATH%"
COPY "%RELEASE_REDIST_DIR%msvcr80.dll" "%RELEASE_DISTRO_PATH%"

SET DEBUG_ARTIFACT_DIR=%ARTIFACT_PATH%Debug\begin\
SET RELEASE_ARTIFACT_DIR=%ARTIFACT_PATH%Release\begin\

COPY "%DEBUG_ARTIFACT_DIR%begin.exe" "%DEBUG_DISTRO_PATH%"
COPY "%DEBUG_ARTIFACT_DIR%editor.eve" "%DEBUG_DISTRO_PATH%"
COPY "%DEBUG_ARTIFACT_DIR%editor.adm" "%DEBUG_DISTRO_PATH%"
COPY "%DEBUG_ARTIFACT_DIR%glossary.xstr" "%DEBUG_DISTRO_PATH%"

COPY "%RELEASE_ARTIFACT_DIR%begin.exe" "%RELEASE_DISTRO_PATH%"
COPY "%RELEASE_ARTIFACT_DIR%editor.eve" "%RELEASE_DISTRO_PATH%"
COPY "%RELEASE_ARTIFACT_DIR%editor.adm" "%RELEASE_DISTRO_PATH%"
COPY "%RELEASE_ARTIFACT_DIR%glossary.xstr" "%RELEASE_DISTRO_PATH%"

POPD
POPD

ECHO Done!

EXIT /B 0

Index: build.bat
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/bin/build.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.bat	2 Dec 2005 02:52:50 -0000	1.6
--- build.bat	3 Feb 2006 18:20:41 -0000	1.7
***************
*** 9,27 ****
  
  if EXIST "%ProgramFiles%\Microsoft Visual Studio .NET 2003\VC7\" (
! 	set BOOST_JAM_TOOLSET_ROOT=%ProgramFiles%\Microsoft Visual Studio .NET 2003\VC7\
! 	set VC71_ROOT=%BOOST_JAM_TOOLSET_ROOT%
  )
  
  if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
! 	echo ###
! 	echo ### Your installation of MSVC is not in a default location.
! 	echo ### You must set environment variable "BOOST_JAM_TOOLSET_ROOT" before you can continue.
! 	echo ### You can either do this by typing at the command line:
! 	echo ### "set BOOST_JAM_TOOLSET_ROOT=C:\Directory\Path\To\VC71\"
! 	echo ### or by setting it as an environment variable in your Windows
! 	echo ### system settings control panel.
! 	echo ### Don't forget the final backslash!
! 	echo ###
! 	goto :Error
  )
  
--- 9,27 ----
  
  if EXIST "%ProgramFiles%\Microsoft Visual Studio .NET 2003\VC7\" (
!     set BOOST_JAM_TOOLSET_ROOT=%ProgramFiles%\Microsoft Visual Studio .NET 2003\VC7\
!     set VC71_ROOT=%BOOST_JAM_TOOLSET_ROOT%
  )
  
  if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
!     echo ###
!     echo ### Your installation of MSVC is not in a default location.
!     echo ### You must set environment variable "BOOST_JAM_TOOLSET_ROOT" before you can continue.
!     echo ### You can either do this by typing at the command line:
!     echo ### "set BOOST_JAM_TOOLSET_ROOT=C:\Directory\Path\To\VC71\"
!     echo ### or by setting it as an environment variable in your Windows
!     echo ### system settings control panel.
!     echo ### Don't forget the final backslash!
!     echo ###
!     goto :Error
  )
  
***************
*** 34,38 ****
  
  if EXIST "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" (
! 	call "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT"
  )
  
--- 34,38 ----
  
  if EXIST "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT" (
!     call "%BOOST_JAM_TOOLSET_ROOT%bin\VCVARS32.BAT"
  )
  
***************
*** 41,45 ****
  
  if EXIST "bjam.exe" (
! 	DEL bjam.exe
  )
  
--- 41,45 ----
  
  if EXIST "bjam.exe" (
!     DEL bjam.exe
  )
  
***************
*** 56,61 ****
  
  if ERRORLEVEL 1 (
! 	echo ### Error : %ERRORLEVEL%
! 	EXIT /B %ERRORLEVEL%
  )
  
--- 56,61 ----
  
  if ERRORLEVEL 1 (
!     echo ### Error : %ERRORLEVEL%
!     EXIT /B %ERRORLEVEL%
  )
  
***************
*** 64,73 ****
  POPD
  
  if "_%HOME%_" == "__" (
! 	set HOME=C:\TEMP\adobe-source
  )
  
  if NOT EXIST "%HOME%" (
! 	MkDir %HOME%\
  )
  
--- 64,75 ----
  POPD
  
+ set TEMP_HOME=C:\TEMP\adobe-source
+ 
  if "_%HOME%_" == "__" (
!     set HOME=%TEMP_HOME%
  )
  
  if NOT EXIST "%HOME%" (
!     MkDir %HOME%\
  )
  
***************
*** 75,84 ****
  
  if NOT EXIST "%HOME%\user-config.jam" (
! 	echo import msvc-config ; > %HOME%\user-config.jam
  )
  
  if ERRORLEVEL 1 (
! 	echo ### Error : %ERRORLEVEL%
! 	EXIT /B %ERRORLEVEL%
  )
  
--- 77,90 ----
  
  if NOT EXIST "%HOME%\user-config.jam" (
!     echo import msvc-config ; > %HOME%\user-config.jam
! )
! 
! if "_%HOME%_" == "_%TEMP_HOME%_" (
!     echo import msvc-config ; > %HOME%\user-config.jam
  )
  
  if ERRORLEVEL 1 (
!     echo ### Error : %ERRORLEVEL%
!     EXIT /B %ERRORLEVEL%
  )
  
***************
*** 90,95 ****
  
  if ERRORLEVEL 1 (
! 	echo ### Error : %ERRORLEVEL%
! 	EXIT /B %ERRORLEVEL%
  )
  
--- 96,101 ----
  
  if ERRORLEVEL 1 (
!     echo ### Error : %ERRORLEVEL%
!     EXIT /B %ERRORLEVEL%
  )
  

Index: install.sh
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/bin/install.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install.sh	8 Aug 2005 16:37:09 -0000	1.2
--- install.sh	3 Feb 2006 18:20:41 -0000	1.3
***************
*** 33,39 ****
  
  if test_path cmd ; then 
! 	echo_run $BJAM"/build.bat"
  else
! 	echo_run $BJAM"/build.sh"
  fi
  
--- 33,39 ----
  
  if test_path cmd ; then 
!     echo_run $BJAM"/build.bat"
  else
!     echo_run $BJAM"/build.sh"
  fi
  

Index: verify.sh
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/bin/verify.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** verify.sh	6 Oct 2005 20:43:12 -0000	1.3
--- verify.sh	3 Feb 2006 18:20:41 -0000	1.4
***************
*** 8,26 ****
  
  if [ "$1" != "" ]; then
! 	MODE="$1"
  fi
  
  if [ "$MODE" == "debug" ]; then
! 	BOOSTLIBEXT="-d"
  else
! 	BOOSTLIBEXT=""
  fi
  
  LIBRARY_SET=(\
! 	third_party/boost_tp/boost/bin.v2/libs/filesystem/build/darwin/$MODE/arch-fat/link-static/threading-multi/libboost_filesystem-mt"$BOOSTLIBEXT"-1_33.a \
! 	third_party/boost_tp/boost/bin.v2/libs/signals/build/darwin/$MODE/arch-fat/link-static/threading-multi/libboost_signals-mt"$BOOSTLIBEXT"-1_33.a \
! 	third_party/boost_tp/boost/bin.v2/libs/thread/build/darwin/$MODE/arch-fat/link-static/threading-multi/libboost_thread-mt"$BOOSTLIBEXT"-1_33.a \
! 	bin.v2/adobe/build/darwin/$MODE/arch-fat/asl-dev/link-static/threading-multi/libasl_dev.a \
! 	bin.v2/adobe/future/widgets/darwin/$MODE/arch-fat/asl-dev/link-static/threading-multi/user-interface-gui/libadobe_widgets.a \
  )
  
--- 8,26 ----
  
  if [ "$1" != "" ]; then
!     MODE="$1"
  fi
  
  if [ "$MODE" == "debug" ]; then
!     BOOSTLIBEXT="-d"
  else
!     BOOSTLIBEXT=""
  fi
  
  LIBRARY_SET=(\
!     third_party/boost_tp/boost/bin.v2/libs/filesystem/build/darwin/$MODE/arch-fat/link-static/threading-multi/libboost_filesystem-mt"$BOOSTLIBEXT"-1_33.a \
!     third_party/boost_tp/boost/bin.v2/libs/signals/build/darwin/$MODE/arch-fat/link-static/threading-multi/libboost_signals-mt"$BOOSTLIBEXT"-1_33.a \
!     third_party/boost_tp/boost/bin.v2/libs/thread/build/darwin/$MODE/arch-fat/link-static/threading-multi/libboost_thread-mt"$BOOSTLIBEXT"-1_33.a \
!     bin.v2/adobe/build/darwin/$MODE/arch-fat/asl-dev/link-static/threading-multi/libasl_dev.a \
!     bin.v2/adobe/future/widgets/darwin/$MODE/arch-fat/asl-dev/link-static/threading-multi/user-interface-gui/libadobe_widgets.a \
  )
  
***************
*** 30,59 ****
  while [ $COUNTER != $SET_COUNT ]; do
  
! 	CURRENT_LIB="${LIBRARY_SET[$COUNTER]}"
  
! 	if [ ! -e $CURRENT_LIB ]; then
  
! 		BASENAME=`basename $CURRENT_LIB`
! 		DIRNAME=`dirname $CURRENT_LIB`
  
! 		if [ `uname` == "Darwin" ]; then
  
! 			osascript -e 'tell application "Finder"' -e 'activate' -e 'beep' -e "display alert \"Cannot find required file:\\n\\n\\t$BASENAME\\n\\nfor the $MODE build.\\n\\nPlease check the read_me.txt file in the ASL distribution for information on how to build this library.\" message \"Looked in directory \\\"$DIRNAME\\\"\" buttons \"OK\" default button \"OK\" as warning" -e "end tell"
  
! 		else
  
! 			echo "Cannot find required library file \"$BASENAME\" for the $MODE build. Please check the read_me.txt file in the ASL distribution for information on how to build this library."
  
! 		fi
  
! 		exit 1
  
! #	else
  
! #		echo "Found \"`basename $CURRENT_LIB`\""
  
! 	fi
  
! 	let COUNTER=COUNTER+1
  
  done
--- 30,59 ----
  while [ $COUNTER != $SET_COUNT ]; do
  
!     CURRENT_LIB="${LIBRARY_SET[$COUNTER]}"
  
!     if [ ! -e $CURRENT_LIB ]; then
  
!         BASENAME=`basename $CURRENT_LIB`
!         DIRNAME=`dirname $CURRENT_LIB`
  
!         if [ `uname` == "Darwin" ]; then
  
!             osascript -e 'tell application "Finder"' -e 'activate' -e 'beep' -e "display alert \"Cannot find required file:\\n\\n\\t$BASENAME\\n\\nfor the $MODE build.\\n\\nPlease check the read_me.txt file in the ASL distribution for information on how to build this library.\" message \"Looked in directory \\\"$DIRNAME\\\"\" buttons \"OK\" default button \"OK\" as warning" -e "end tell"
  
!         else
  
!             echo "Cannot find required library file \"$BASENAME\" for the $MODE build. Please check the read_me.txt file in the ASL distribution for information on how to build this library."
  
!         fi
  
!         exit 1
  
! #   else
  
! #       echo "Found \"`basename $CURRENT_LIB`\""
  
!     fi
  
!     let COUNTER=COUNTER+1
  
  done

Index: build.sh
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/bin/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.sh	7 Nov 2005 18:00:37 -0000	1.4
--- build.sh	3 Feb 2006 18:20:41 -0000	1.5
***************
*** 22,30 ****
  # Assuming the client only needs to run this once, we always build bjam
  if [ -e bjam ]; then
! 	if test_path cmd ; then
! 		echo_run rm bjam.exe
! 	else
! 		echo_run rm bjam
! 	fi
  fi
  
--- 22,30 ----
  # Assuming the client only needs to run this once, we always build bjam
  if [ -e bjam ]; then
!     if test_path cmd ; then
!         echo_run rm bjam.exe
!     else
!         echo_run rm bjam
!     fi
  fi
  
***************
*** 33,56 ****
  cd ../../
  
  if [ "$HOME" == "" ]; then
! 	HOME="/tmp/adobe-source"
  fi
  
  if [ ! -d "$HOME" ]; then
! 	echo_run mkdir -p "$HOME"
  fi
  
! if [ ! -e "$HOME/user-config.jam" ]; then
! 	if [ "`uname`" == "Darwin" ]; then
! 		echo "import toolset : using ; using darwin ;" > "$HOME/user-config.jam"
! 	else
! 		if [ -d "$PROGRAMFILES/Microsoft Visual Studio .NET 2003/" ]; then
! 			echo "import msvc-config ; import toolset : using ; using gcc ;" > "$HOME/user-config.jam"
! 		elif [ -d "$PROGRAMFILES/Microsoft Visual Studio 8/" ]; then
! 			echo "import msvc-config ; import toolset : using ; using gcc ;" > "$HOME/user-config.jam"
! 		else
! 			echo "import toolset : using ; using gcc ;" > "$HOME/user-config.jam"
! 		fi
! 	fi
  fi
  
--- 33,58 ----
  cd ../../
  
+ TEMP_HOME="/tmp/adobe-source"
+ 
  if [ "$HOME" == "" ]; then
!     HOME=$TEMP_HOME
  fi
  
  if [ ! -d "$HOME" ]; then
!     echo_run mkdir -p "$HOME"
  fi
  
! if [ ! -e "$HOME/user-config.jam" -o "$HOME" == "$TEMP_HOME"]; then
!     if [ "`uname`" == "Darwin" ]; then
!         echo "import toolset : using ; using darwin ;" > "$HOME/user-config.jam"
!     else
!         if [ -d "$PROGRAMFILES/Microsoft Visual Studio .NET 2003/" ]; then
!             echo "import msvc-config ; import toolset : using ; using gcc ;" > "$HOME/user-config.jam"
!         elif [ -d "$PROGRAMFILES/Microsoft Visual Studio 8/" ]; then
!             echo "import msvc-config ; import toolset : using ; using gcc ;" > "$HOME/user-config.jam"
!         else
!             echo "import toolset : using ; using gcc ;" > "$HOME/user-config.jam"
!         fi
!     fi
  fi
  
***************
*** 58,68 ****
  
  if [ "$1" != "" ]; then
! 	MODE=$1
  fi
  
  if test_path cmd ; then
! 	echo_run adobe/bin/bjam msvc gcc $MODE
  else
! 	echo_run adobe/bin/bjam $MODE
  fi
  
--- 60,70 ----
  
  if [ "$1" != "" ]; then
!     MODE=$1
  fi
  
  if test_path cmd ; then
!     echo_run adobe/bin/bjam msvc gcc $MODE
  else
!     echo_run adobe/bin/bjam $MODE
  fi
  

Index: asl_net_setup.bat
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/bin/asl_net_setup.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** asl_net_setup.bat	6 Jan 2006 18:35:03 -0000	1.6
--- asl_net_setup.bat	3 Feb 2006 18:20:41 -0000	1.7
***************
*** 1,5 ****
  @ECHO OFF
  
! set ASL_DISTRO_NAME=asl_1.0.12.zip
  set ASL_DIR_NAME=adobe-source
  set ASL_DISTRO_HOST=easynews.dl.sourceforge.net
--- 1,5 ----
  @ECHO OFF
  
! set ASL_DISTRO_NAME=asl_1.0.13.zip
  set ASL_DIR_NAME=adobe-source
  set ASL_DISTRO_HOST=easynews.dl.sourceforge.net
***************
*** 15,74 ****
  
  if NOT EXIST %UNZIP_DISTRO_NAME% (
! 	echo Getting unzip executable...
  
! 	echo cd pub/unix/archiving/info-zip/WIN32 > cmds.txt
! 	echo bin >> cmds.txt
! 	echo get %UNZIP_DISTRO_NAME% >> cmds.txt
! 	echo bye >> cmds.txt
  
! 	ftp -v -s:cmds.txt -A sunsite.icm.edu.pl
  
! 	del cmds.txt
  )
  
  if NOT EXIST %CURL_DISTRO_NAME% (
! 	echo Getting curl distribution...
  
! 	echo cd pub/www/utilities/curl > cmds.txt
! 	echo bin >> cmds.txt
! 	echo get %CURL_DISTRO_NAME% >> cmds.txt
! 	echo bye >> cmds.txt
  
! 	ftp -v -s:cmds.txt -A ftp.sunet.se
  
! 	del cmds.txt
  )
  
  if NOT EXIST %UNZIP_EXE_NAME% (
! 	echo Setting up unzip...
  
! 	mkdir unzip
  
! 	move unz552xN.exe unzip
  
! 	PUSHD unzip
  
! 	unz552xN.exe
  
! 	POPD
  )
  
  if NOT EXIST %CURL_EXE_NAME% (
! 	echo Extracting curl...
! 	%UNZIP_EXE_NAME% %CURL_DISTRO_NAME%
  )
  
  if NOT "_%1%_" == "__" (
! 	set ASL_DISTRO_HOST=%1%
  )
  
  if NOT EXIST %ASL_DISTRO_NAME% (
! 	echo Getting ASL distribution...
! 	%CURL_EXE_NAME% http://%ASL_DISTRO_HOST%/sourceforge/adobe-source/%ASL_DISTRO_NAME% -o %ASL_DISTRO_NAME%
  )
  
  if NOT EXIST %BOOST_DISTRO_NAME% (
! 	echo Getting Boost distribution...
! 	%CURL_EXE_NAME% http://easynews.dl.sourceforge.net/sourceforge/boost/%BOOST_DISTRO_NAME% -o %BOOST_DISTRO_NAME%
  )
  
--- 15,74 ----
  
  if NOT EXIST %UNZIP_DISTRO_NAME% (
!     echo Getting unzip executable...
  
!     echo cd pub/unix/archiving/info-zip/WIN32 > cmds.txt
!     echo bin >> cmds.txt
!     echo get %UNZIP_DISTRO_NAME% >> cmds.txt
!     echo bye >> cmds.txt
  
!     ftp -v -s:cmds.txt -A sunsite.icm.edu.pl
  
!     del cmds.txt
  )
  
  if NOT EXIST %CURL_DISTRO_NAME% (
!     echo Getting curl distribution...
  
!     echo cd pub/www/utilities/curl > cmds.txt
!     echo bin >> cmds.txt
!     echo get %CURL_DISTRO_NAME% >> cmds.txt
!     echo bye >> cmds.txt
  
!     ftp -v -s:cmds.txt -A ftp.sunet.se
  
!     del cmds.txt
  )
  
  if NOT EXIST %UNZIP_EXE_NAME% (
!     echo Setting up unzip...
  
!     mkdir unzip
  
!     move unz552xN.exe unzip
  
!     PUSHD unzip
  
!     unz552xN.exe
  
!     POPD
  )
  
  if NOT EXIST %CURL_EXE_NAME% (
!     echo Extracting curl...
!     %UNZIP_EXE_NAME% %CURL_DISTRO_NAME%
  )
  
  if NOT "_%1%_" == "__" (
!     set ASL_DISTRO_HOST=%1%
  )
  
  if NOT EXIST %ASL_DISTRO_NAME% (
!     echo Getting ASL distribution...
!     %CURL_EXE_NAME% http://%ASL_DISTRO_HOST%/sourceforge/adobe-source/%ASL_DISTRO_NAME% -o %ASL_DISTRO_NAME%
  )
  
  if NOT EXIST %BOOST_DISTRO_NAME% (
!     echo Getting Boost distribution...
!     %CURL_EXE_NAME% http://easynews.dl.sourceforge.net/sourceforge/boost/%BOOST_DISTRO_NAME% -o %BOOST_DISTRO_NAME%
  )
  
***************
*** 76,107 ****
  
  if NOT EXIST %PATCH_DISTRO_NAME% (
! 	echo Getting Win32 patch distribution...
! 	%CURL_EXE_NAME% http://easynews.dl.sourceforge.net/sourceforge/gnuwin32/%PATCH_DISTRO_NAME% -o %PATCH_DISTRO_NAME%
  )
  
  if NOT EXIST %PATCH_EXE_NAME% (
! 	echo Extracting patch...
! 	copy %PATCH_DISTRO_NAME% gnuwin32\
! 	PUSHD gnuwin32\
! 	..\%UNZIP_EXE_NAME% %PATCH_DISTRO_NAME% > nul
! 	POPD
  )
  
  if NOT EXIST %ASL_DIR_NAME% (
! 	echo Extracting ASL distribution...
! 	%UNZIP_EXE_NAME% %ASL_DISTRO_NAME% > nul
  )
  
  if NOT EXIST adobe-source\third_party\boost_tp\%BOOST_DIR_NAME% (
! 	echo Setting up destination Boost directory, which could take a while...
! 	%UNZIP_EXE_NAME% %BOOST_DISTRO_NAME% > nul
! 	move %BOOST_DIR_NAME% adobe-source\third_party\boost_tp
  )
  
  if NOT EXIST adobe-source\third_party\boost_tp\boost (
! 	echo Setting up source Boost directory, which could take a while...
! 	PUSHD adobe-source\third_party\boost_tp
! 	xcopy %BOOST_DIR_NAME% boost /S /E /I /Y > nul
! 	POPD
  )
  
--- 76,107 ----
  
  if NOT EXIST %PATCH_DISTRO_NAME% (
!     echo Getting Win32 patch distribution...
!     %CURL_EXE_NAME% http://easynews.dl.sourceforge.net/sourceforge/gnuwin32/%PATCH_DISTRO_NAME% -o %PATCH_DISTRO_NAME%
  )
  
  if NOT EXIST %PATCH_EXE_NAME% (
!     echo Extracting patch...
!     copy %PATCH_DISTRO_NAME% gnuwin32\
!     PUSHD gnuwin32\
!     ..\%UNZIP_EXE_NAME% %PATCH_DISTRO_NAME% > nul
!     POPD
  )
  
  if NOT EXIST %ASL_DIR_NAME% (
!     echo Extracting ASL distribution...
!     %UNZIP_EXE_NAME% %ASL_DISTRO_NAME% > nul
  )
  
  if NOT EXIST adobe-source\third_party\boost_tp\%BOOST_DIR_NAME% (
!     echo Setting up destination Boost directory, which could take a while...
!     %UNZIP_EXE_NAME% %BOOST_DISTRO_NAME% > nul
!     move %BOOST_DIR_NAME% adobe-source\third_party\boost_tp
  )
  
  if NOT EXIST adobe-source\third_party\boost_tp\boost (
!     echo Setting up source Boost directory, which could take a while...
!     PUSHD adobe-source\third_party\boost_tp
!     xcopy %BOOST_DIR_NAME% boost /S /E /I /Y > nul
!     POPD
  )
  

Index: asl_net_setup.sh
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/bin/asl_net_setup.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** asl_net_setup.sh	6 Jan 2006 18:35:04 -0000	1.6
--- asl_net_setup.sh	3 Feb 2006 18:20:41 -0000	1.7
***************
*** 1,5 ****
  #!/bin/bash
  
! ASL_DISTRO_NAME=asl_1.0.12.tgz
  ASL_DISTRO_SITE=easynews.dl.sourceforge.net
  BOOST_NAME=boost_1_33_1
--- 1,5 ----
  #!/bin/bash
  
! ASL_DISTRO_NAME=asl_1.0.13.tgz
  ASL_DISTRO_SITE=easynews.dl.sourceforge.net
  BOOST_NAME=boost_1_33_1
***************
*** 31,57 ****
  
  if [ "$1" != "" ]; then
! 	ASL_DISTRO_SITE="$1"
  fi
  
  if [ ! -e $ASL_DISTRO_NAME ]; then
! 	echo_run curl http://$ASL_DISTRO_SITE/sourceforge/adobe-source/$ASL_DISTRO_NAME -o $ASL_DISTRO_NAME
  fi
  
  if [ ! -e $BOOST_DISTRO_NAME ]; then
! 	echo_run curl http://easynews.dl.sourceforge.net/sourceforge/boost/$BOOST_DISTRO_NAME -o $BOOST_DISTRO_NAME
  fi
  
  if [ ! -d adobe-source ]; then
! 	echo_run tar -xzf $ASL_DISTRO_NAME
  fi
  
  if [ ! -d adobe-source/third_party/boost_tp/$BOOST_NAME ]; then
! 	echo_run tar -xzf $BOOST_DISTRO_NAME
! 	echo_run mv $BOOST_NAME adobe-source/third_party/boost_tp/
  fi
  
  if [ ! -d adobe-source/third_party/boost_tp/boost ]; then
! 	echo_run tar -xzf $BOOST_DISTRO_NAME
! 	echo_run mv $BOOST_NAME adobe-source/third_party/boost_tp/boost
  fi
  
--- 31,57 ----
  
  if [ "$1" != "" ]; then
!     ASL_DISTRO_SITE="$1"
  fi
  
  if [ ! -e $ASL_DISTRO_NAME ]; then
!     echo_run curl http://$ASL_DISTRO_SITE/sourceforge/adobe-source/$ASL_DISTRO_NAME -o $ASL_DISTRO_NAME
  fi
  
  if [ ! -e $BOOST_DISTRO_NAME ]; then
!     echo_run curl http://easynews.dl.sourceforge.net/sourceforge/boost/$BOOST_DISTRO_NAME -o $BOOST_DISTRO_NAME
  fi
  
  if [ ! -d adobe-source ]; then
!     echo_run tar -xzf $ASL_DISTRO_NAME
  fi
  
  if [ ! -d adobe-source/third_party/boost_tp/$BOOST_NAME ]; then
!     echo_run tar -xzf $BOOST_DISTRO_NAME
!     echo_run mv $BOOST_NAME adobe-source/third_party/boost_tp/
  fi
  
  if [ ! -d adobe-source/third_party/boost_tp/boost ]; then
!     echo_run tar -xzf $BOOST_DISTRO_NAME
!     echo_run mv $BOOST_NAME adobe-source/third_party/boost_tp/boost
  fi