[GRASS-SVN] r31430 - grass/branches/develbranch_6/win32
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon May 19 15:15:39 EDT 2008
Author: marcopx
Date: 2008-05-19 15:15:37 -0400 (Mon, 19 May 2008)
New Revision: 31430
Modified:
grass/branches/develbranch_6/win32/GRASS-Packager.bat
Log:
Fix bugs #160 and #162: missing msys coreutils + Removed useless Tcl/Tk files
Modified: grass/branches/develbranch_6/win32/GRASS-Packager.bat
===================================================================
--- grass/branches/develbranch_6/win32/GRASS-Packager.bat 2008-05-19 16:25:48 UTC (rev 31429)
+++ grass/branches/develbranch_6/win32/GRASS-Packager.bat 2008-05-19 19:15:37 UTC (rev 31430)
@@ -1,49 +1,57 @@
@echo off
-rem ----------------------------------------------------------------------------------------------------------
+rem --------------------------------------------------------------------------------------------------------------------------
rem Set the script variables
-rem ----------------------------------------------------------------------------------------------------------
+rem --------------------------------------------------------------------------------------------------------------------------
-set TRUNK_INSTALL_FOLDER=c:\msys\local\grass-trunk
-set TEST_PACKAGE_DIR=.\GRASS-Trunk-Package
+set GRASS_RELEASE_PACKAGE_DIR=.\GRASS-Release-Package
+set GRASS_6_DEV_PACKAGE_DIR=.\GRASS-6-Dev-Package
+set GRASS_7_DEV_PACKAGE_DIR=.\GRASS-7-Dev-Package
-set RELEASE_INSTALL_FOLDER=c:\msys\local\grass-6.3.0
-set RELEASE_PACKAGE_DIR=.\GRASS-Release-Package
+set GRASS_RELEASE_INSTALL_FOLDER=c:\msys\local\grass-6.3.0
+set GRASS_6_DEV_INSTALL_FOLDER=c:\msys\local\grass-6-svn
+set GRASS_7_DEV_INSTALL_FOLDER=c:\msys\local\grass-7-svn
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Self Contained GRASS Automated Packager
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo GRASS Version: Current SVN Trunk/Release Tarball
- at echo.
@echo Edited by: Marco Pasetti
- at echo Last Update: 21 April 2008
+ at echo Last Update: 17 May 2008
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Select if you want to create a Test Package from the Current SVN Trunk Build
- at echo or a Release Package from the Current GRASS Release Tarball Build
+ at echo Select the GRASS version to pack:
@echo.
- at echo 1. Current GRASS SVN Trunk Build
+ at echo 1. Current GRASS Release Version
@echo.
- at echo 2. Current GRASS Release Tarball Build
+ at echo 2. Current GRASS-6 Development Version
@echo.
+ at echo 3. Current GRASS-7 Development Version
+ at echo.
-set /p UPDATE_TYPE=Enter your selection (1/2):
+set /p SELECTION=Enter your selection (1/2/3):
-if %UPDATE_TYPE%==1 (
-set PACKAGE_DIR=%TEST_PACKAGE_DIR%
-set GRASS_PREFIX=%TRUNK_INSTALL_FOLDER%
+if %SELECTION%==1 (
+set PACKAGE_DIR=%GRASS_RELEASE_PACKAGE_DIR%
+set GRASS_PREFIX=%GRASS_RELEASE_INSTALL_FOLDER%
)
-if %UPDATE_TYPE%==2 (
-set PACKAGE_DIR=%RELEASE_PACKAGE_DIR%
-set GRASS_PREFIX=%RELEASE_INSTALL_FOLDER%
+if %SELECTION%==2 (
+set PACKAGE_DIR=%GRASS_6_DEV_PACKAGE_DIR%
+set GRASS_PREFIX=%GRASS_6_DEV_INSTALL_FOLDER%
)
+if %SELECTION%==3 (
+set PACKAGE_DIR=%GRASS_7_DEV_PACKAGE_DIR%
+set GRASS_PREFIX=%GRASS_7_DEV_INSTALL_FOLDER%
+)
+
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Create PACKAGE_DIR
+ at echo Remove the previous Selected Package and create a new PACKAGE_DIR
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
+pause
+
if exist %PACKAGE_DIR% rmdir /S/Q %PACKAGE_DIR%
mkdir %PACKAGE_DIR%
@@ -64,6 +72,7 @@
mkdir %PACKAGE_DIR%\extralib
copy c:\msys\local\bin\*.dll %PACKAGE_DIR%\extralib
+copy c:\msys\local\sqlitel\bin\*.dll %PACKAGE_DIR%\extralib
copy c:\msys\local\pgsql\lib\libpq.dll %PACKAGE_DIR%\extralib
@echo.
@@ -74,6 +83,7 @@
mkdir %PACKAGE_DIR%\extrabin
copy c:\msys\local\bin\*.exe %PACKAGE_DIR%\extrabin
+copy c:\msys\local\sqlite\bin\*.exe %PACKAGE_DIR%\extrabin
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -81,8 +91,7 @@
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-mkdir %PACKAGE_DIR%\sqlite
-xcopy c:\msys\local\sqlite %PACKAGE_DIR%\sqlite /S/V/F
+xcopy c:\msys\local\sqlite %PACKAGE_DIR%\sqlite /S/V/F/I
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -90,8 +99,7 @@
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-mkdir %PACKAGE_DIR%\proj
-xcopy c:\msys\local\share\proj %PACKAGE_DIR%\proj /S/V/F
+xcopy c:\msys\local\share\proj %PACKAGE_DIR%\proj /S/V/F/I
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -100,8 +108,23 @@
@echo.
mkdir %PACKAGE_DIR%\tcl-tk
-xcopy c:\msys\local\tcl-tk %PACKAGE_DIR%\tcl-tk /S/V/F
+mkdir %PACKAGE_DIR%\tcl-tk\include
+mkdir %PACKAGE_DIR%\tcl-tk\lib
+mkdir %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
+mkdir %PACKAGE_DIR%\tcl-tk\lib\tk8.5
+xcopy c:\msys\local\tcl-tk\bin %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
+
+copy c:\msys\local\tcl-tk\include\*.h %PACKAGE_DIR%\tcl-tk\include
+
+copy c:\msys\local\tcl-tk\lib\tcl8.5\*.tcl %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
+copy c:\msys\local\tcl-tk\lib\tcl8.5\tclIndex %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
+
+copy c:\msys\local\tcl-tk\lib\tk8.5\*.tcl %PACKAGE_DIR%\tcl-tk\lib\tk8.5
+copy c:\msys\local\tcl-tk\lib\tk8.5\tclIndex %PACKAGE_DIR%\tcl-tk\lib\tk8.5
+
+xcopy c:\msys\local\tcl-tk\lib\tk8.5\ttk %PACKAGE_DIR%\tcl-tk\lib\tk8.5\ttk /S/V/F/I
+
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy MSYS files to PACKAGE_DIR\msys
@@ -109,15 +132,16 @@
@echo.
mkdir %PACKAGE_DIR%\msys
-mkdir %PACKAGE_DIR%\msys\bin
-mkdir %PACKAGE_DIR%\msys\doc
-mkdir %PACKAGE_DIR%\msys\etc
copy c:\msys\* %PACKAGE_DIR%\msys
-xcopy c:\msys\bin %PACKAGE_DIR%\msys\bin /S/V/F
-xcopy c:\msys\doc %PACKAGE_DIR%\msys\doc /S/V/F
-xcopy c:\msys\etc %PACKAGE_DIR%\msys\etc /S/V/F
+xcopy c:\msys\bin %PACKAGE_DIR%\msys\bin /S/V/F/I
+xcopy c:\msys\doc %PACKAGE_DIR%\msys\doc /S/V/F/I
+xcopy c:\msys\etc %PACKAGE_DIR%\msys\etc /S/V/F/I
+xcopy c:\msys\info %PACKAGE_DIR%\msys\info /S/V/F/I
+xcopy c:\msys\lib %PACKAGE_DIR%\msys\lib /S/V/F/I
+xcopy c:\msys\man %PACKAGE_DIR%\msys\man /S/V/F/I
+
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Packaging Completed
More information about the grass-commit
mailing list