You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2012/03/15 19:48:09 UTC
svn commit: r1301136 - in /incubator/etch/trunk:
binding-c/runtime/c/README.txt examples/example_mixin/ scripts/antsetup.bat
scripts/apr-install.bat scripts/cunit-install.bat
Author: sccomer
Date: Thu Mar 15 18:48:09 2012
New Revision: 1301136
URL: http://svn.apache.org/viewvc?rev=1301136&view=rev
Log:
some small changes to scripts to make them work better. and a new script to help with cunit installation.
ignoring build product from example_mixin.
added some svn:eol-style=native properties where needed.
Added:
incubator/etch/trunk/scripts/cunit-install.bat (with props)
Modified:
incubator/etch/trunk/binding-c/runtime/c/README.txt (contents, props changed)
incubator/etch/trunk/examples/example_mixin/ (props changed)
incubator/etch/trunk/scripts/antsetup.bat (contents, props changed)
incubator/etch/trunk/scripts/apr-install.bat (contents, props changed)
Modified: incubator/etch/trunk/binding-c/runtime/c/README.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-c/runtime/c/README.txt?rev=1301136&r1=1301135&r2=1301136&view=diff
==============================================================================
--- incubator/etch/trunk/binding-c/runtime/c/README.txt (original)
+++ incubator/etch/trunk/binding-c/runtime/c/README.txt Thu Mar 15 18:48:09 2012
@@ -42,7 +42,7 @@ APR and APR-ICONV libraries
APR and APR-ICONV can be build via MS Visual Studio GUI. After that, all needed
artifacts have to be copied to above folder and file structure. If you do so, please
follow the instructions on http://apr.apache.org/compiling_win32.html. The installation
-to <ETCH_EXTERNAL_DEPENDS> have to be done by hand. Nedded projects are: apr,
+to <ETCH_EXTERNAL_DEPENDS> have to be done by hand. Needed projects are: apr,
apriconv, libapr, libapriconv, libapriconv_ccs_modules and libapriconv_ces_modules.
A much more easy way is to use our apr-install.bat script (../trunk/scrips/). To run the
@@ -66,7 +66,7 @@ CUnit
- <ETCH_EXTERNAL_DEPENDS>/cunit/2.1/lib/libcunit.lib
- <ETCH_EXTERNAL_DEPENDS>/cunit/2.1/lib/vc80_libcunit.pdb
- <ETCH_EXTERNAL_DEPENDS>/cunit/2.1/res
-- <ETCH_EXTERNAL_DEPENDS>/cunit/2.1/res/*dtd + *.xsl (shared files, nedded to show cunit results)
+- <ETCH_EXTERNAL_DEPENDS>/cunit/2.1/res/*.dtd + *.xsl (shared files, nedded to show cunit results)
Open the CUNIT solution in VS ([external_source]/cunit/VS8/CUnit.sln) and build
libcunit project. After build, copy nedded artificts to <ETCH_EXTERNAL_DEPENDS>
Propchange: incubator/etch/trunk/binding-c/runtime/c/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/etch/trunk/examples/example_mixin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 15 18:48:09 2012
@@ -0,0 +1 @@
+target
Modified: incubator/etch/trunk/scripts/antsetup.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/scripts/antsetup.bat?rev=1301136&r1=1301135&r2=1301136&view=diff
==============================================================================
--- incubator/etch/trunk/scripts/antsetup.bat (original)
+++ incubator/etch/trunk/scripts/antsetup.bat Thu Mar 15 18:48:09 2012
@@ -20,11 +20,15 @@
IF "%ETCH_EXTERNAL_DEPENDS%" == "" (
set ETCH_EXTERNAL_DEPENDS=C:\etch\external
)
+
+@rem ANT_HOME settings
+IF "%ANT_HOME%" == "" (
set ANT_HOME=%ETCH_EXTERNAL_DEPENDS%\apache-ant\1.8.2
+)
@rem JAVA_HOME settings
IF "%JAVA_HOME%" == "" (
-set JAVA_HOME="c:\Program Files (x86)\Java\jdk1.6.0_18\"
+set JAVA_HOME=c:\Program Files ^(x86^)\Java\jdk1.6.0_18
)
@rem NUNIT_HOME settings
@@ -33,7 +37,9 @@ set NUNIT_HOME=%ETCH_EXTERNAL_DEPENDS%\N
)
@rem CMAKE_HOME settings
+IF "%CMAKE_HOME%" == "" (
set CMAKE_HOME=%ETCH_EXTERNAL_DEPENDS%\cmake\2.8.6
+)
@rem uncomment this line / unset this variable if you don't want to build csharp
set DOTNET_HOME=C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319
@@ -47,6 +53,13 @@ set PATH=%ANT_HOME%\bin;%JAVA_HOME%\bin;
@echo ANT_HOME: %ANT_HOME%
@echo JAVA_HOME: %JAVA_HOME%
@echo NUNIT_HOME: %NUNIT_HOME%
-@echo DOTNET_HOME: %DOTNET_HOME%
@echo CMAKE_HOME: %CMAKE_HOME%
+@echo DOTNET_HOME: %DOTNET_HOME%
@echo ==================================================
+
+if not exist "%ETCH_EXTERNAL_DEPENDS%" echo "%ETCH_EXTERNAL_DEPENDS%" does not exist
+if not exist "%ANT_HOME%" echo "%ANT_HOME%" does not exist
+if not exist "%JAVA_HOME%" echo "%JAVA_HOME%" does not exist
+if not exist "%NUNIT_HOME%" echo "%NUNIT_HOME%" does not exist
+if not exist "%CMAKE_HOME%" echo "%CMAKE_HOME%" does not exist
+if not exist "%DOTNET_HOME%" echo "%DOTNET_HOME%" does not exist
Propchange: incubator/etch/trunk/scripts/antsetup.bat
('eol-style' removed)
Modified: incubator/etch/trunk/scripts/apr-install.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/scripts/apr-install.bat?rev=1301136&r1=1301135&r2=1301136&view=diff
==============================================================================
--- incubator/etch/trunk/scripts/apr-install.bat (original)
+++ incubator/etch/trunk/scripts/apr-install.bat Thu Mar 15 18:48:09 2012
@@ -1,177 +1,192 @@
-@rem Licensed to the Apache Software Foundation (ASF) under one *
-@rem or more contributor license agreements. See the NOTICE file *
-@rem distributed with this work for additional information *
-@rem regarding copyright ownership. The ASF licenses this file *
-@rem to you under the Apache License, Version 2.0 (the *
-@rem "License"); you may not use this file except in compliance *
-@rem with the License. You may obtain a copy of the License at *
-@rem *
-@rem http://www.apache.org/licenses/LICENSE-2.0 *
-@rem *
-@rem Unless required by applicable law or agreed to in writing, *
-@rem software distributed under the License is distributed on an *
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
-@rem KIND, either express or implied. See the License for the *
-@rem specific language governing permissions and limitations *
-@rem under the License. *
-@echo off
-
-@REM set INSTALL_PREFIX=C:\dev\projects\Etch\externals
-@REM set VC_HOME=C:\Program Files (x86)\Microsoft Visual Studio 8\VC
-
-REM check if environment is set
-IF "%INSTALL_PREFIX%" == "" (
-set ERROR_MSG="Please set env INSTALL_PREFIX to install location"
-goto error
-)
-
-IF "%VC_HOME%" == "" (
-set ERROR_MSG="Please set env VC_HOME to VC install location"
-goto error
-)
-
-IF "%1%" == "" (
-set ERROR_MSG="Please give command parameter"
-call :help
-goto error
-)
-
-IF "%1%" == "download" (
-call :download
-goto ende
-)
-IF "%1%" == "convert" (
-call :convert
-goto ende
-)
-IF "%1%" == "build" (
-call :build
-goto ende
-)
-IF "%1%" == "install" (
-call :install
-goto ende
-)
-
-set ERROR_MSG="Invalid command parameter"
-call :help
-goto error
-
-:download:
-@echo ==================================================
-@echo Downloading APR ...
-@echo ==================================================
-rm -rf apr
-mkdir apr
-cd apr
-
-REM apr
-svn export https://svn.apache.org/repos/asf/apr/apr/tags/1.4.6/ apr
-
-REM apr-util
-svn export https://svn.apache.org/repos/asf/apr/apr-util/tags/1.4.1/ apr-util
-
-REM apr-iconv
-svn export https://svn.apache.org/repos/asf/apr/apr-iconv/tags/1.2.1/ apr-iconv
-
-cd ..
-@echo ==================================================
-@echo Downloading APR done.
-@echo ==================================================
-goto :EOF
-
-:build-init
-@echo ==================================================
-@echo Init VS environment...
-@echo ==================================================
-
-call "%VC_HOME%\bin\vcvars32.bat"
-
-@echo ==================================================
-@echo Init VS environment done.
-@echo ==================================================
-goto :EOF
-
-:convert
-call :build-init
-
-@echo ==================================================
-@echo Converting APR to new VS version...
-@echo This is a manual step and have to be done only oncs. After VS is
-@echo opened, please accept conversion for all projects and save the
-@echo solution. After that , please close VS.
-@echo ==================================================
-PAUSE
-cd apr/apr-util
-devenv aprutil.dsw
-cd ../..
-
-@echo ==================================================
-@echo Converting APR to new VS version done.
-@echo Building APR done.
-@echo ==================================================
-
-goto :EOF
-
-:build
-call :build-init
-
-@echo ==================================================
-@echo Building APR...
-@echo ==================================================
-
-cd apr/apr-util
-devenv aprutil.sln /build Release /project apr
-devenv aprutil.sln /build Release /project apriconv
-devenv aprutil.sln /build Release /project libapr
-devenv aprutil.sln /build Release /project libapriconv
-devenv aprutil.sln /build Release /project libapriconv_ccs_modules
-devenv aprutil.sln /build Release /project libapriconv_ces_modules
-cd ../..
-
-@echo ==================================================
-@echo Building APR done.
-@echo ==================================================
-goto :EOF
-
-:install
-set INSTALL_PREFIX_APR=%INSTALL_PREFIX%\apr\1.4.5
-mkdir "%INSTALL_PREFIX_APR%\bin"
-mkdir "%INSTALL_PREFIX_APR%\iconv"
-mkdir "%INSTALL_PREFIX_APR%\include\apr-1"
-mkdir "%INSTALL_PREFIX_APR%\lib"
-REM copy artifacts
-xcopy /Y apr\apr\include\*.h "%INSTALL_PREFIX_APR%\include\apr-1\"
-xcopy /Y apr\apr\Release\libapr-1.dll "%INSTALL_PREFIX_APR%\bin\"
-xcopy /Y apr\apr\Release\libapr-1.pdb "%INSTALL_PREFIX_APR%\bin\"
-xcopy /Y apr\apr\Release\libapr-1.lib "%INSTALL_PREFIX_APR%\lib\"
-xcopy /Y apr\apr-iconv\include\*.h "%INSTALL_PREFIX_APR%\include\apr-1\"
-xcopy /Y apr\apr-iconv\Release\libapriconv-1.lib "%INSTALL_PREFIX_APR%\lib\"
-xcopy /Y apr\apr-iconv\Release\libapriconv-1.dll "%INSTALL_PREFIX_APR%\bin\"
-xcopy /Y apr\apr-iconv\Release\libapriconv-1.pdb "%INSTALL_PREFIX_APR%\bin\"
-xcopy /Y apr\apr-iconv\Release\iconv\*.so "%INSTALL_PREFIX_APR%\iconv\"
-xcopy /Y apr\apr-iconv\Release\iconv\*.pdb "%INSTALL_PREFIX_APR%\iconv\"
-goto :EOF
-
-:help:
-@echo ==================================================
-@echo Help
-@echo ==================================================
-@echo Following commands are available.
-@echo apr-install.bat download // Dowload all APR sources to ./apr/
-@echo apr-install.bat convert // Start VS to convert APR projects
-@echo apr-install.bat build // Build APR
-@echo apr-install.bat install // Install APR to given location
-goto :EOF
-
-:error
-@echo ==================================================
-@echo Error: %ERROR_MSG%
-@echo ==================================================
-goto ende
-
-:ende
-goto :EOF
-
-
-
+@rem Licensed to the Apache Software Foundation (ASF) under one *
+@rem or more contributor license agreements. See the NOTICE file *
+@rem distributed with this work for additional information *
+@rem regarding copyright ownership. The ASF licenses this file *
+@rem to you under the Apache License, Version 2.0 (the *
+@rem "License"); you may not use this file except in compliance *
+@rem with the License. You may obtain a copy of the License at *
+@rem *
+@rem http://www.apache.org/licenses/LICENSE-2.0 *
+@rem *
+@rem Unless required by applicable law or agreed to in writing, *
+@rem software distributed under the License is distributed on an *
+@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+@rem KIND, either express or implied. See the License for the *
+@rem specific language governing permissions and limitations *
+@rem under the License. *
+@echo off
+
+@REM set INSTALL_PREFIX=C:\dev\projects\Etch\externals
+@REM set VC_HOME=C:\Program Files ^(x86^)\Microsoft Visual Studio 8\VC
+@REM use this instead on 32-bit windows:
+@REM set VC_HOME=C:\Program Files\Microsoft Visual Studio 8\VC
+
+REM check if environment is set
+IF "%INSTALL_PREFIX%" == "" (
+set ERROR_MSG="Please set env INSTALL_PREFIX to install location"
+goto error
+)
+
+IF "%VC_HOME%" == "" (
+set ERROR_MSG="Please set env VC_HOME to VC install location"
+goto error
+)
+
+IF "%1%" == "" (
+set ERROR_MSG="Please give command parameter"
+call :help
+goto error
+)
+
+IF "%1%" == "download" (
+call :download
+goto ende
+)
+IF "%1%" == "convert" (
+call :convert
+goto ende
+)
+IF "%1%" == "build" (
+call :build
+goto ende
+)
+IF "%1%" == "install" (
+call :install
+goto ende
+)
+
+set ERROR_MSG="Invalid command parameter"
+call :help
+goto error
+
+:download:
+@echo ==================================================
+@echo Downloading APR ...
+@echo ==================================================
+rm -rf apr
+mkdir apr
+cd apr
+
+REM apr
+rem svn export https://svn.apache.org/repos/asf/apr/apr/tags/1.4.6/ apr
+wget http://apache.imsam.info//apr/apr-1.4.6-win32-src.zip
+unzip apr-1.4.6-win32-src.zip
+mv apr-1.4.6 apr
+rm -rf apr-1.4.6-win32-src.zip
+
+REM apr-util
+rem svn export https://svn.apache.org/repos/asf/apr/apr-util/tags/1.4.1/ apr-util
+wget http://apache.imsam.info//apr/apr-util-1.4.1-win32-src.zip
+unzip apr-util-1.4.1-win32-src.zip
+mv apr-util-1.4.1 apr-util
+rm -rf apr-util-1.4.1-win32-src.zip
+
+REM apr-iconv
+rem svn export https://svn.apache.org/repos/asf/apr/apr-iconv/tags/1.2.1/ apr-iconv
+wget http://mirror.synyx.de/apache//apr/apr-iconv-1.2.1-win32-src-r2.zip
+unzip apr-iconv-1.2.1-win32-src-r2.zip
+mv apr-iconv-1.2.1 apr-iconv
+rm -rf apr-iconv-1.2.1-win32-src-r2.zip
+
+cd ..
+@echo ==================================================
+@echo Downloading APR done.
+@echo ==================================================
+goto :EOF
+
+:build-init
+@echo ==================================================
+@echo Init VS environment...
+@echo ==================================================
+
+call "%VC_HOME%\bin\vcvars32.bat"
+
+@echo ==================================================
+@echo Init VS environment done.
+@echo ==================================================
+goto :EOF
+
+:convert
+call :build-init
+
+@echo ==================================================
+@echo Converting APR to new VS version...
+@echo This is a manual step and have to be done only oncs. After VS is
+@echo opened, please accept conversion for all projects and save the
+@echo solution. After that , please close VS.
+@echo ==================================================
+PAUSE
+cd apr\apr-util
+devenv aprutil.dsw
+cd ..\..
+
+@echo ==================================================
+@echo Converting APR to new VS version done.
+@echo Building APR done.
+@echo ==================================================
+
+goto :EOF
+
+:build
+call :build-init
+
+@echo ==================================================
+@echo Building APR...
+@echo ==================================================
+
+cd apr\apr-util
+devenv aprutil.sln /build Release /project apr
+devenv aprutil.sln /build Release /project apriconv
+devenv aprutil.sln /build Release /project libapr
+devenv aprutil.sln /build Release /project libapriconv
+devenv aprutil.sln /build Release /project libapriconv_ccs_modules
+devenv aprutil.sln /build Release /project libapriconv_ces_modules
+cd ..\..
+
+@echo ==================================================
+@echo Building APR done.
+@echo ==================================================
+goto :EOF
+
+:install
+rem should be 1.4.6 but this is a hack
+set INSTALL_PREFIX_APR=%INSTALL_PREFIX%\apr\1.4.5
+mkdir "%INSTALL_PREFIX_APR%\bin"
+mkdir "%INSTALL_PREFIX_APR%\iconv"
+mkdir "%INSTALL_PREFIX_APR%\include\apr-1"
+mkdir "%INSTALL_PREFIX_APR%\lib"
+REM copy artifacts
+xcopy /Y apr\apr\include\*.h "%INSTALL_PREFIX_APR%\include\apr-1\"
+xcopy /Y apr\apr\Release\libapr-1.dll "%INSTALL_PREFIX_APR%\bin\"
+xcopy /Y apr\apr\Release\libapr-1.pdb "%INSTALL_PREFIX_APR%\bin\"
+xcopy /Y apr\apr\Release\libapr-1.lib "%INSTALL_PREFIX_APR%\lib\"
+xcopy /Y apr\apr-iconv\include\*.h "%INSTALL_PREFIX_APR%\include\apr-1\"
+xcopy /Y apr\apr-iconv\Release\libapriconv-1.lib "%INSTALL_PREFIX_APR%\lib\"
+xcopy /Y apr\apr-iconv\Release\libapriconv-1.dll "%INSTALL_PREFIX_APR%\bin\"
+xcopy /Y apr\apr-iconv\Release\libapriconv-1.pdb "%INSTALL_PREFIX_APR%\bin\"
+xcopy /Y apr\apr-iconv\Release\iconv\*.so "%INSTALL_PREFIX_APR%\iconv\"
+xcopy /Y apr\apr-iconv\Release\iconv\*.pdb "%INSTALL_PREFIX_APR%\iconv\"
+goto :EOF
+
+:help:
+@echo ==================================================
+@echo Help
+@echo ==================================================
+@echo Following commands are available.
+@echo apr-install.bat download // Dowload all APR sources to ./apr/
+@echo apr-install.bat convert // Start VS to convert APR projects
+@echo apr-install.bat build // Build APR
+@echo apr-install.bat install // Install APR to given location
+goto :EOF
+
+:error
+@echo ==================================================
+@echo Error: %ERROR_MSG%
+@echo ==================================================
+goto ende
+
+:ende
+goto :EOF
+
+
+
Propchange: incubator/etch/trunk/scripts/apr-install.bat
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/etch/trunk/scripts/cunit-install.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/scripts/cunit-install.bat?rev=1301136&view=auto
==============================================================================
--- incubator/etch/trunk/scripts/cunit-install.bat (added)
+++ incubator/etch/trunk/scripts/cunit-install.bat Thu Mar 15 18:48:09 2012
@@ -0,0 +1,85 @@
+@rem Licensed to the Apache Software Foundation (ASF) under one *
+@rem or more contributor license agreements. See the NOTICE file *
+@rem distributed with this work for additional information *
+@rem regarding copyright ownership. The ASF licenses this file *
+@rem to you under the Apache License, Version 2.0 (the *
+@rem "License"); you may not use this file except in compliance *
+@rem with the License. You may obtain a copy of the License at *
+@rem *
+@rem http://www.apache.org/licenses/LICENSE-2.0 *
+@rem *
+@rem Unless required by applicable law or agreed to in writing, *
+@rem software distributed under the License is distributed on an *
+@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+@rem KIND, either express or implied. See the License for the *
+@rem specific language governing permissions and limitations *
+@rem under the License. *
+@echo off
+
+@REM run this from the top of the cunit source directory, e.g.,
+@REM g:\wks\tools\cunit\2.1\CUnit-2.1-0
+
+@REM set INSTALL_PREFIX=C:\dev\projects\Etch\externals
+
+REM check if environment is set
+IF "%INSTALL_PREFIX%" == "" (
+set ERROR_MSG="Please set env INSTALL_PREFIX to install location"
+goto error
+)
+
+IF "%1%" == "" (
+set ERROR_MSG="Please give command parameter"
+call :help
+goto error
+)
+
+IF "%1%" == "install" (
+call :install
+goto ende
+)
+
+set ERROR_MSG="Invalid command parameter"
+call :help
+goto error
+
+:install
+set INSTALL_PREFIX_CUNIT=%INSTALL_PREFIX%\cunit\2.1
+
+set CYGWIN=nodosfilewarning
+rm -rf "%INSTALL_PREFIX_CUNIT%\bin"
+rm -rf "%INSTALL_PREFIX_CUNIT%\include"
+rm -rf "%INSTALL_PREFIX_CUNIT%\lib"
+rm -rf "%INSTALL_PREFIX_CUNIT%\res"
+
+mkdir "%INSTALL_PREFIX_CUNIT%\bin"
+mkdir "%INSTALL_PREFIX_CUNIT%\include"
+mkdir "%INSTALL_PREFIX_CUNIT%\lib"
+mkdir "%INSTALL_PREFIX_CUNIT%\res"
+
+REM copy artifacts
+xcopy /Y "CUnit\Headers\*.h" "%INSTALL_PREFIX_CUNIT%\include\"
+xcopy /Y "VC8\Release - Static Lib\libcunit.lib" "%INSTALL_PREFIX_CUNIT%\lib\"
+xcopy /Y "VC8\Release - Static Lib\vc80_libcunit.pdb" "%INSTALL_PREFIX_CUNIT%\lib\"
+xcopy /Y "Share\*.dtd" "%INSTALL_PREFIX_CUNIT%\res\"
+xcopy /Y "Share\*.xsl" "%INSTALL_PREFIX_CUNIT%\res\"
+goto :EOF
+
+:help:
+@echo ==================================================
+@echo Help
+@echo ==================================================
+@echo Following commands are available.
+@echo cunit-install.bat install // Install CUNIT to given location
+goto :EOF
+
+:error
+@echo ==================================================
+@echo Error: %ERROR_MSG%
+@echo ==================================================
+goto ende
+
+:ende
+goto :EOF
+
+
+
Propchange: incubator/etch/trunk/scripts/cunit-install.bat
------------------------------------------------------------------------------
svn:eol-style = native