commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1092017 - in /commons/sandbox/runtime/trunk/src/main/native: ./ os/win32/ srclib/bzip2/
Date Thu, 14 Apr 2011 06:35:38 GMT
Author: mturk
Date: Thu Apr 14 06:35:38 2011
New Revision: 1092017

URL: http://svn.apache.org/viewvc?rev=1092017&view=rev
Log:
Add win32 initial make and impl files

Added:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in   (with props)
    commons/sandbox/runtime/trunk/src/main/native/configure.bat   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/commonc.manifest   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw
    commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/init.c   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.bin   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.mc   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c   (with props)
    commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c   (with props)
Modified:
    commons/sandbox/runtime/trunk/src/main/native/srclib/bzip2/bzlib.h

Added: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (added)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Thu Apr 14 06:35:38 2011
@@ -0,0 +1,176 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+!include <Makedefs>
+
+SRCDIRS=\
+	$(TOPDIR)\os\win32 \
+	$(TOPDIR)\port \
+	$(TOPDIR)\shared \
+	$(TOPDIR)\srclib\bzip2 \
+	$(TOPDIR)\srclib\zlib \
+	$(TOPDIR)\srclib\zlib\win32
+
+LIBS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib crypt32.lib \
+	shell32.lib rpcrt4.lib user32.lib gdi32.lib userenv.lib wtsapi32.lib \
+	psapi.lib shlwapi.lib wldap32.lib netapi32.lib iphlpapi.lib urlmon.lib
+
+!IF "$(EXTRA_LIBS)" != ""
+LIBS=$(LIBS) $(EXTRA_LIBS)
+!ENDIF
+
+OUTLIBDIR=$(TOPDIR)\.libs
+SHAREDDLL=$(OUTLIBDIR)\$(DLLNAME).dll
+SHAREDLIB=$(OUTLIBDIR)\$(DLLNAME).lib
+SHAREDPDB=$(OUTLIBDIR)\$(DLLNAME).pdb
+SHAREDRES=$(OUTLIBDIR)\$(DLLNAME).res
+SHAREDMAN=$(SHAREDDLL).mainfest
+
+BZIP2_SOURCES=\
+	$(TOPDIR)\srclib\bzip2\blocksort.c \
+	$(TOPDIR)\srclib\bzip2\bzlib.c \
+	$(TOPDIR)\srclib\bzip2\compress.c \
+	$(TOPDIR)\srclib\bzip2\crctable.c \
+	$(TOPDIR)\srclib\bzip2\decompress.c \
+	$(TOPDIR)\srclib\bzip2\huffman.c \
+	$(TOPDIR)\srclib\bzip2\randtable.c
+
+EXPAT_SOURCES=\
+	$(TOPDIR)\srclib\expat\xmlparse.c \
+	$(TOPDIR)\srclib\expat\xmltok.c \
+	$(TOPDIR)\srclib\expat\xmlrole.c
+
+REGEX_SOURCES=\
+	$(TOPDIR)\srclib\regex\regcomp.c \
+	$(TOPDIR)\srclib\regex\regerror.c \
+	$(TOPDIR)\srclib\regex\regexec.c \
+	$(TOPDIR)\srclib\regex\regfree.c
+
+ZLIB_SOURCES=\
+	$(TOPDIR)\srclib\zlib\adler32.c \
+	$(TOPDIR)\srclib\zlib\compress.c \
+	$(TOPDIR)\srclib\zlib\crc32.c \
+	$(TOPDIR)\srclib\zlib\deflate.c \
+	$(TOPDIR)\srclib\zlib\infback.c \
+	$(TOPDIR)\srclib\zlib\inffast.c \
+	$(TOPDIR)\srclib\zlib\inflate.c \
+	$(TOPDIR)\srclib\zlib\inftrees.c \
+	$(TOPDIR)\srclib\zlib\trees.c \
+	$(TOPDIR)\srclib\zlib\uncompr.c \
+	$(TOPDIR)\srclib\zlib\zutil.c
+
+ASMSOURCES=
+
+WIN32_SOURCES=\
+	$(TOPDIR)\os\win32\dso.c \
+	$(TOPDIR)\os\win32\init.c \
+	$(TOPDIR)\os\win32\os.c \
+	$(TOPDIR)\os\win32\platform.c \
+	$(TOPDIR)\os\win32\semaphore.c \
+	$(TOPDIR)\os\win32\time.c \
+	$(TOPDIR)\os\win32\util.c
+
+
+LIBSOURCES=\
+	$(BZIP2_SOURCES) \
+	$(ZLIB_SOURCES) \
+	$(WIN32_SOURCES) \
+	$(TOPDIR)\port\bsdpath.c \
+	$(TOPDIR)\port\bsdrand.c \
+	$(TOPDIR)\port\bsdstring.c \
+	$(TOPDIR)\port\bsdsys.c \
+	$(TOPDIR)\shared\array.c \
+	$(TOPDIR)\shared\bzip2.c \
+	$(TOPDIR)\shared\callback.c \
+	$(TOPDIR)\shared\clazz.c \
+	$(TOPDIR)\shared\constptr.c \
+	$(TOPDIR)\shared\debug.c \
+	$(TOPDIR)\shared\error.c \
+	$(TOPDIR)\shared\iofd.c \
+	$(TOPDIR)\shared\memory.c \
+	$(TOPDIR)\shared\native.c \
+	$(TOPDIR)\shared\nbb.c \
+	$(TOPDIR)\shared\pointer.c \
+	$(TOPDIR)\shared\object.c \
+	$(TOPDIR)\shared\observer.c \
+	$(TOPDIR)\shared\reflect.c \
+	$(TOPDIR)\shared\sliceptr.c \
+	$(TOPDIR)\shared\string.c \
+	$(TOPDIR)\shared\system.c \
+	$(TOPDIR)\shared\unsafe.c \
+	$(TOPDIR)\shared\uuid.c \
+	$(TOPDIR)\shared\version.c \
+	$(TOPDIR)\shared\buildmark.c
+
+CXXSOURCES=
+
+DEPOBJECTS=$(LIBSOURCES:.c=.dep)
+SHROBJECTS=$(LIBSOURCES:.c=.obj) $(ASMSOURCES:.asm=.obj) $(TOPDIR)\os\win32\main.res
+
+all : prepare $(SHAREDDLL)
+
+.c.obj:
+	$(CC) $(CCFLAGS) $(CCSHARE) $(CPPOPTS) $(CFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(OUTLIBDIR)\$(DLLNAME)
$<
+
+.asm.obj:
+	$(CPP) $(CCSHARE) $(CPPOPTS) $(ASMOPTS) $< >$@.S
+	$(AS) $(ASFLAGS) -c -o $@ $@.S
+	@$(RM) $@.S
+
+.rc.res:
+	$(RC) $(RCFLAGS) $(RCINCLS) /fo $@ $<
+
+.c.dep:
+	@mkdepend $*.$$(OBJ) $(CCFLAGS) $(CCSHARE) $(CPPOPTS) $(CFLAGS) $(INCLUDES) $< >>Makedeps
+
+$(SHAREDDLL): $(SHROBJECTS)
+	@echo Building shared library ...
+	$(LD) /DLL $(LDFLAGS) /SUBSYSTEM:WINDOWS $(LDARCH) /pdb:$(OUTLIBDIR)\$(DLLNAME).pdb /OUT:$@
@<<
+	$(SHROBJECTS) $(MODULES) $(LIBS)
+<<
+	if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
+
+Makefile: $(TOPDIR)\Makefile.msc.in
+	@$(TOPDIR)\config.nice.bat
+	$(MAKE)
+
+prepare: Makefile
+	@echo Building $(DESC) ...
+	-@mkdir $(OUTLIBDIR) 2>NUL
+
+prepdep:
+	@echo Creating $(DESC) dependencies ...
+	@echo # >Makedeps
+	@echo # AUTOMATICALLY GENERATED BY 'nmake depend' -- DO NOT EDIT >>Makedeps
+	@echo # >>Makedeps
+	@echo. >>Makedeps
+
+depend: prepdep $(DEPOBJECTS)
+
+clean:
+	@for %i in ($(SRCDIRS)) do @$(RM) %%i\*.obj 2>NUL
+	@for %i in ($(SRCDIRS)) do @$(RM) %%i\*.res 2>NUL
+	@$(RMDIR) $(OUTLIBDIR) 2>NUL
+	@echo Cleaned.
+
+distclean: clean
+	@$(RM) Makedefs 2>NUL
+	@$(RM) Makefile 2>NUL
+	@$(RM) Makedeps 2>NUL
+	@$(RM) config.nice.bat 2>NUL
+
+OBJ=obj
+!include <Makedeps>

Propchange: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/configure.bat
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure.bat?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure.bat (added)
+++ commons/sandbox/runtime/trunk/src/main/native/configure.bat Thu Apr 14 06:35:38 2011
@@ -0,0 +1,329 @@
+@echo off
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements.  See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem 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, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+rem Batch script for building Apache Commons Runtime
+rem
+setlocal
+
+rem Figure out the running platform
+rem
+
+echo @echo off >config.nice.bat
+echo %0 %* >>config.nice.bat
+
+set EXITCODE=0
+
+SET "VMAJOR=0"
+SET "VMINOR=1"
+SET "VPATCH=0"
+SET "VDOTTED=%VMAJOR%.%VMINOR%.%VPATCH%"
+set "TOPDIR=."
+set "PACKAGE=libacr"
+set "NAME=acr"
+set "PNAME=ACR"
+set "DESC=Apache Commons Runtime Library"
+set "PREFIX=/Program Files/Common Files/Apache"
+set "BINDIR=bin"
+set "LIBDIR=lib"
+set "SHRDIR=share"
+set "INCDIR=include/%NAME%-%VMAJOR%"
+set "CPPOPTS=-DWIN32 -D_WIN32 -DWINDOWS -D_WINDOWS -D_WIN32 -DWINNT -D_WINNT"
+set "CPPOPTS=%CPPOPTS% -D_WIN32_WINNT=0x0502 -DWINVER=0x0502 -D_WIN32_IE=0x0600 -D_UNICODE
-DUNICODE"
+set "CCFLAGS=-nologo"
+set "LDFLAGS=/NOLOGO /INCREMENTAL:NO /DEBUG"
+set "INCLUDES=-I$(TOPDIR)\include -I$(TOPDIR)\port -I$(TOPDIR)\srclib -I$(TOPDIR)\os\win32
+set "RCFLAGS=/l 0x409 /d WINDOWS /d _WINDOWS /d WIN32 /d _WIN32"
+set "RCINCLS=/i $(TOPDIR)\include /i $(TOPDIR)\port /i $(TOPDIR)\srclib /i $(TOPDIR)\os\win32"
+set "WITH_JAVA=%JAVA_HOME%"
+
+set "OPTION=%~1"
+shift
+if /i "%OPTION%" == "/x86" goto TargetX86
+if /i "%OPTION%" == "/x64" goto TargetX64
+if /i "%OPTION%" == "/i64" goto TargetI64
+if /i "%OPTION%" == "/?"    goto Usage
+if /i "%OPTION%" == "/help" goto Usage
+if /i "%OPTION%" == "/target" (
+  shift
+  if /i "%~1" == "x86" goto TargetX86
+  if /i "%~1" == "x64" goto TargetX64
+  if /i "%~1" == "i64" goto TargetI64
+  echo Unknown Target '%~1'
+  goto Usage
+)
+echo Unknown option '%OPTION%'
+goto Usage
+
+rem This needs to get modified by hand according to the compiler used
+set EXTLIBS=bufferoverflowu.lib fileextd.lib
+
+:TargetX86
+set BITS=32
+set MCPU=_I386_
+set CCPU=i686
+set ARCH=i386
+set MACH=X86
+goto TargetAll
+:TargetX64
+set BITS=64
+set MCPU=_X86_64_
+set CCPU=x86_64
+set ARCH=x86_64
+set MACH=AMD64
+goto TargetAll
+:TargetI64
+set BITS=64
+set MCPU=_IA64_
+set CCPU=ia64
+set ARCH=ia64
+set MACH=IA64
+goto TargetAll
+
+:TargetAll
+set ENABLE_TESTP=0
+set ENABLE_DEBUG=0
+set ENABLE_IPV6=0
+set HAVE_OPENSSL=0
+set HAVE_INTRIN_H=0
+set WITH_OPENSSL=
+
+:ParseOption
+set "OPTION=%~1"
+if "x%OPTION%" == "x" goto OptionsDone
+shift
+if "%OPTION%" == "/?" goto Usage
+if "%OPTION%" == "/help" goto Usage
+if "%OPTION%" == "/enable-test-private" (
+  set "ENABLE_TESTP=1"
+  goto ParseOption
+)
+if "%OPTION%" == "/debug" (
+  set "ENABLE_DEBUG=1"
+  goto ParseOption
+)
+if "%OPTION%" == "/enable-ipv6" (
+  set "ENABLE_IPV6=1"
+  goto ParseOption
+)
+if "%OPTION%" == "/with-inirinsics" (
+  set "HAVE_INTRIN_H=1"
+  goto ParseOption
+)
+if "%OPTION%" == "/with-openssl" (
+  set "HAVE_OPENSSL=1"
+  set "WITH_OPENSSL=%~1"
+  shift
+  goto ParseOption
+)
+if "%OPTION%" == "/with-java" (
+  set "WITH_JAVA=%~1"
+  shift
+  goto ParseOption
+)
+echo Unknown option '%OPTION%'
+goto Usage
+:OptionsDone
+rem
+rem Validate options
+rem
+if %HAVE_OPENSSL% == 1 (
+  if "%WITH_OPENSSL%x" == "x" (
+     echo /with-openssl requires an argument
+     goto Usage
+  )
+  if not exist "%WITH_OPENSSL%\openssl\openssl.h" (
+     echo.
+     echo WARNING Cannot find inc32/openssl/openssl.h
+     echo "%WITH_OPENSSL%" is not a valid OpenSSL path.
+     echo Make sure you set the correct path using /with-openssl
+     echo.
+  )
+  set "INCLUDES=%INCLUDES% -I%WITH_OPENSSL%"
+)
+
+if not exist "%WITH_JAVA%\include\jni.h" (
+  echo.
+  echo WARNING Cannot find include/jni.h
+  echo "%WITH_JAVA%" is not a valid Java SDK path.
+  echo Make sure you set the correct path using /with-java
+  echo.
+)
+set "INCLUDES=%INCLUDES% -I"%WITH_JAVA%\include" -I"%WITH_JAVA%\include\win32""
+set "RCINCLS=%RCINCLS% /i "%WITH_JAVA%\include" /i "%WITH_JAVA%\include\win32""
+
+set "CCFLAGS=%CCFLAGS% -O2 -Ob2 -Zi -D_MT"
+if %ENABLE_DEBUG% == 1 (
+  set "CPPOPTS=-DDEBUG -D_DEBUG %CPPOPTS%"
+  set "CCFLAGS=%CCFLAGS% -MDd"
+  set "RCFLAGS=%RCFLAGS% /d DEBUG /d _DEBUG"
+) else (
+  set "CPPOPTS=-DNDEBUG %CPPOPTS%"
+  set "CCFLAGS=%CCFLAGS% -MD"
+  set "LDFLAGS=%LDFLAGS% /OPT:REF"
+  set "RCFLAGS=%RCFLAGS% /d NDEBUG"
+)
+
+if %BITS% == 32 (
+set CC_SIZEOF_VOIDP=4
+set CC_SIZEOF_SIZE_T=4
+set CC_SIZEOF_SSIZE_T=4
+set CPPOPTS=%CPPOPTS% -D%MCPU%
+set AS=ml
+) else (
+set CC_SIZEOF_VOIDP=8
+set CC_SIZEOF_SIZE_T=8
+set CC_SIZEOF_SSIZE_T=8
+set CPPOPTS=%CPPOPTS% -D%MCPU% -D_WIN64 -DWIN64
+set AS=ml64
+)
+set RCFLAGS=%RCFLAGS% /d %MCPU% /d OCPR_COMPILE /d OCPR_API_EXPORT
+set LDARCH=/MACHINE:%MACH%
+set ARFLAGS=/NOLOGO /MACHINE:%MACH%
+set CPPOPTS=%CPPOPTS% -D__CC%BITS%
+if %ENABLE_IPV6% == 1 (
+  set "CPPOPTS=%CPPOPTS% -DENABLE_IPV6"
+)
+if %ENABLE_TESTP% == 1 (
+  set "CPPOPTS=%CPPOPTS% -DENABLE_TEST_PRIVATE"
+)
+set "CPPOPTS=%CPPOPTS% -D_REENTRANT"
+
+echo Configuring %PACKAGE% for windows%BITS%-%CCPU%
+echo.
+echo OpenSSL support            %HAVE_OPENSSL%
+echo Debug                      %ENABLE_DEBUG%
+echo Test private APIenabled    %ENABLE_TESTP%
+echo IPV6 enabled               %ENABLE_IPV6%
+echo Using JDK                  %WITH_JAVA%
+
+set "CCI=.\include\acr\config_%ARCH%.h"
+echo /*>%CCI%
+echo  * AUTOMATICALLY GENERATED BY CONFIGURE SCRIPT -- DO NOT EDIT>>%CCI%
+echo  */>>%CCI%
+echo #ifndef _ACR_CONFIG%MCPU%H_>>%CCI%
+echo #define _ACR_CONFIG%MCPU%H_>>%CCI%
+echo.>>%CCI%
+echo #ifdef __cplusplus>>%CCI%
+echo extern "C" {>>%CCI%
+echo #endif>>%CCI%
+
+type .\os\win32\config.hw >>%CCI%
+
+echo #define HAVE_INTRIN_H           ^%HAVE_INTRIN_H%>>%CCI%
+echo #define HAVE_OPENSSL            ^%HAVE_OPENSSL%>>%CCI%
+echo.>>%CCI%
+echo #define PACKAGE_NAME            "%NAME%">>%CCI%
+echo #define PACKAGE_PRINT           "%PNAME%">>%CCI%
+echo #define PACKAGE_DESC            "%DESC%">>%CCI%
+echo #define PACKAGE_PREFIX          "%PREFIX%">>%CCI%
+echo #define PACKAGE_BINDIR          "%BINDIR%">>%CCI%
+echo #define PACKAGE_LIBDIR          "%LIBDIR%">>%CCI%
+echo #define PACKAGE_INCDIR          "%INCDIR%">>%CCI%
+echo #define PACKAGE_SHAREDIR        "%SHRDIR%">>%CCI%
+echo #define PACKAGE_CONFIGURED      "%DATE%">>%CCI%
+echo #define PACKAGE_DLLEXT          "dll">>%CCI%
+echo #define PACKAGE_JNIEXT          "dll">>%CCI%
+echo.>>%CCI%
+echo #define CC_BITS                 ^%BITS%>>%CCI%
+echo #define CC_SIZEOF_INT           ^4>>%CCI%
+echo #define CC_SIZEOF_WCHAR_T       ^2>>%CCI%
+echo #define CC_SIZEOF_LONG          ^4>>%CCI%
+echo #define CC_SIZEOF_LONG_LONG     ^8>>%CCI%
+echo #define CC_SIZEOF_LONG_DOUBLE   ^8>>%CCI%
+echo #define CC_SIZEOF_VOIDP         ^%CC_SIZEOF_VOIDP%>>%CCI%
+echo #define CC_SIZEOF_SIZE_T        ^%CC_SIZEOF_SIZE_T%>>%CCI%
+echo #define CC_SIZEOF_SSIZE_T       ^%CC_SIZEOF_SSIZE_T%>>%CCI%
+echo #define CC_SIZEOF_OFF_T         ^8>>%CCI%
+echo #define CC_SIZEOF_OFF64_T       ^8>>%CCI%
+echo #define CC_IS_BIG_ENDIAN        ^0>>%CCI%
+echo.>>%CCI%
+echo #ifdef __cplusplus>>%CCI%
+echo }>>%CCI%
+echo #endif>>%CCI%
+echo #endif /* _ACR_CONFIG%MCPU%H_ */>>%CCI%
+echo.>>%CCI%
+
+set "MKI=.\Makedefs"
+set "MKD=.\Makedeps"
+echo #>%MKI%
+echo # AUTOMATICALLY GENERATED BY CONFIGURE SCRIPT -- DO NOT EDIT>>%MKI%
+echo #>>%MKI%
+echo NAME=%NAME%>>%MKI%
+echo DLLNAME=lib%NAME%>>%MKI%
+echo LIBNAME=lib%NAME%_s>>%MKI%
+echo DESC=%DESC%>>%MKI%
+echo HOST=windows>>%MKI%
+echo HOSTSRC=win32>>%MKI%
+echo PLATFORM=WINDOWS>>%MKI%
+echo ARCH=%MACH%>>%MKI%
+echo BITS=%BITS%>>%MKI%
+echo CC=cl>>%MKI%
+echo CXX=cl>>%MKI%
+echo CPP=cl -E>>%MKI%
+echo AS=%AS%>>%MKI%
+echo AR=lib>>%MKI%
+echo LD=link>>%MKI%
+echo RM=del /Q>>%MKI%
+echo RMDIR=del /S /Q>>%MKI%
+echo.>>%MKI%
+echo PREFIX=%PREFIX%>>%MKI%
+echo BINDIR=%BINDIR%>>%MKI%
+echo INCDIR=%INCDIR%>>%MKI%
+echo SHRDIR=%SHRDIR%>>%MKI%
+echo LIBDIR=%LIBDIR%>>%MKI%
+echo ABSTOPDIR=%CD%>>%MKI%
+echo TOPDIR=.>>%MKI%
+echo MODULES=%MODULES%>>%MKI%
+echo ENABLE_DEBUG=^%ENABLE_DEBUG%>>%MKI%
+echo ENABLE_TESTP=^%ENABLE_TESTP% >>%MKI%
+echo.>>%MKI%
+echo ARFLAGS=%ARFLAGS%>>%MKI%
+echo CCFLAGS=%CCFLAGS%>>%MKI%
+echo CPPOPTS=%CPPOPTS%>>%MKI%
+echo CCSHARE=%CCSHARE%>>%MKI%
+echo CSTATIC=%CSTATIC%>>%MKI%
+echo LDFLAGS=%LDFLAGS%>>%MKI%
+echo LDARCH=%LDARCH%>>%MKI%
+echo RCFLAGS=%RCFLAGS%>>%MKI%
+echo RCINCLS=%RCINCLS%>>%MKI%
+echo INCLUDES=%INCLUDES%>>%MKI%
+echo.>>%MKI%
+
+echo #>%MKD%
+echo # AUTOMATICALLY GENERATED BY CONFIGURE SCRIPT -- DO NOT EDIT>>%MKD%
+echo #>>%MKD%
+
+type .\Makefile.msc.in >Makefile
+
+goto ConfigureDone
+
+:Usage
+echo Usage configure.bat /x86^|/x64^|/i64 [options]
+echo Options can be
+echo.  /help^|/?               This page
+echo   /enable-test-private   Enable private API testsuite
+echo   /enable-ipv6           Enable IPV6 support
+echo   /debug                 Compile with DEBUG turned on
+echo   /with-openssl ^<path^>   Define path for OpenSSL library
+echo   /with-java    ^<path^>   Define path for Java SDK
+echo.
+goto ConfigureDone
+:Failed
+echo.
+echo Configure Failed!
+:ConfigureDone
+exit /B %EXITCODE%

Propchange: commons/sandbox/runtime/trunk/src/main/native/configure.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/commonc.manifest
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/commonc.manifest?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/commonc.manifest (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/commonc.manifest Thu Apr 14 06:35:38
2011
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity version="3.1.0.0" processorArchitecture="*" name="Apache Commons Runtime"
type="win32" />
+<description>Apache Commons Runtime</description>
+<dependency>
+<dependentAssembly>
+<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0"
processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />
+</dependentAssembly>
+</dependency>
+</assembly>

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/commonc.manifest
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/config.hw Thu Apr 14 06:35:38 2011
@@ -0,0 +1,131 @@
+
+#define HAVE_UNISTD_H           0
+#define HAVE_STRING_H           1
+#define HAVE_STRINGS_H          0
+#define HAVE_INTTYPES_H         0
+#define HAVE_STDINT_H           0
+#define HAVE_WTYPES_H           0
+#define HAVE_STDBOOL_H          0
+#define HAVE_DLFCN_H            0
+#define HAVE_LINK_H             0
+#define HAVE_FCNTL_H            1
+#define HAVE_SYS_FILE_H         0
+#define HAVE_SYS_TYPES_H        0
+#define HAVE_SYS_CDEFS_H        0
+#define HAVE_SYS_QUEUE_H        0
+#define HAVE_SYS_RESOURCE_H     0
+#define HAVE_SYS_SELECT_H       0
+#define HAVE_SYS_SOCKET_H       0
+#define HAVE_SYS_STAT_H         1
+#define HAVE_SYS_WAIT_H         0
+#define HAVE_SYS_SYSLIMITS_H    0
+#define HAVE_SYS_SYSCALL_H      0
+#define HAVE_SYS_UIO_H          0
+#define HAVE_SYS_MMAN_H         0
+#define HAVE_SYS_EPOLL_H        0
+#define HAVE_SYS_EVENT_H        0
+#define HAVE_SYS_EVENTFD_H      0
+#define HAVE_SYS_SIGNALFD_H     0
+#define HAVE_SYS_INOTIFY_H      0
+#define HAVE_SYS_TIME_H         0
+#define HAVE_LIMITS_H           1
+#define HAVE_NETDB_H            0
+#define HAVE_NETINET_IN_H       0
+#define HAVE_ARPA_INET_H        0
+#define HAVE_RESOLV_H           0
+#define HAVE_SYS_UN_H           0
+#define HAVE_SEMAPHORE_H        0
+#define HAVE_UCONTEXT_H         0
+#define HAVE_LIBGEN_H           0
+#define HAVE_EXECINFO_H         0
+#define HAVE_AIO_H              0
+#define HAVE_LIBAIO_H           0
+#define HAVE_FNMATCH_H          0
+#define HAVE_LANGINFO_H         0
+#define HAVE_LOCALE_H           1
+#define HAVE_STRLCAT            0
+#define HAVE_STRLCPY            0
+#define HAVE_STRSIGNAL          0
+#define HAVE_STRMODE            0
+#define HAVE_WCSDUP             1
+#define HAVE_BASENAME_R         0
+#define HAVE_DIRNAME_R          0
+#define HAVE_WCSCASECMP         1
+#define HAVE_HSTRERROR          0
+#define HAVE_STRERROR_R         0
+#define HAVE_GETGRENT_R         0
+#define HAVE_GETGRGID_R         0
+#define HAVE_GETGRNAM_R         0
+#define HAVE_GETPWENT_R         0
+#define HAVE_GETPWNAM_R         0
+#define HAVE_GETPWUID_R         0
+#define HAVE_READDIR_R          1
+#define HAVE_READDIR64_R        0
+#define HAVE_MMAP64             0
+#define HAVE_POSIX_MEMALIGN     0
+#define HAVE_POSIX_SEMAPHORE    0
+#define HAVE_FDATASYNC          0
+#define HAVE_FLOCK              0
+#define HAVE_CLOCK_GETTIME      0
+#define HAVE_KQUEUE             0
+#define HAVE_INOTIFY_INIT       0
+#define HAVE_USLEEP             0
+#define HAVE_NANOSLEEP          0
+#define HAVE_LOCALTIME_R        0
+#define HAVE_GMTIME_R           0
+#define HAVE_SIGSETJMP          0
+#define HAVE_SIGACTION          0
+#define HAVE_SIGWAIT            0
+#define HAVE_SIGSUSPEND         0
+#define HAVE_FDWALK             0
+#define HAVE_SETRLIMIT          0
+#define HAVE_BACKTRACE          0
+#define HAVE_PTHREAD_RWLOCK     0
+#define HAVE_PTHREAD_SPINLOCK   0
+#define HAVE_PTHREAD_TRYJOIN    0
+#define HAVE_PTHREAD_TIMEDJOIN  0
+#define HAVE_ISNAN              1
+#define HAVE_ISINF              1
+#define HAVE_GETPAGESIZE        0
+#define HAVE_SETENV             1
+#define HAVE_UNSETENV           0
+#define HAVE_DUP3               0
+#define HAVE_EPOLL_CREATE1      0
+#define HAVE_ACCEPT4            0
+#define HAVE_EVENTFD            0
+#define HAVE_EVENTFD2           0
+#define HAVE_SIGNALFD           0
+#define HAVE_PIPE2              0
+#define HAVE_FCHDIR             0
+#define HAVE_WRITEV             0
+#define HAVE_ARC4RANDOM         0
+#define HAVE_MKDTEMP            0
+#define HAVE_PREAD              0
+#define HAVE_PWRITE             0
+#define HAVE_STRTOLL            0
+#define HAVE_STRTOULL           0
+#define HAVE_STRTONUM           0
+#define HAVE_SOCK_CLOEXEC       0
+#define HAVE_FILE_CLOEXEC       0
+#define HAVE_TM_TM_GMTOFF       0
+#define HAVE_DIRENT_D_INO       0
+#define HAVE_DIRENT_D_FILENO    0
+#define HAVE_DIRENT_D_TYPE      1
+#define HAVE_STAT_ST_ATIM       0
+#define HAVE_STAT_ST_ATIMENSEC  0
+#define HAVE_STAT_ST_ATIME_N    0
+#define HAVE_STAT_ST_BLOCKS     0
+#define HAVE_OFF64_T            0
+#define HAVE_LONG_DOUBLE        0
+#define HAVE_INTPTR_T           1
+#define HAVE_UINTPTR_T          1
+#define HAVE_UNION_SEMUN        0
+#define HAVE_PRETTY_FUNCTION    0
+#define HAVE_FUNCTION           1
+#define HAVE_FUNC               0
+#define HAVE_FUNCSIG            1
+#define HAVE_THREAD_LOCAL       1
+
+#define HAVE_OCSP               0
+#define HAVE_KSTAT              0
+#define HAVE_PORT_H             0

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c Thu Apr 14 06:35:38 2011
@@ -0,0 +1,22 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "acr/string.h"
+#include "acr/error.h"
+#include "acr/port.h"
+#include "acr/dso.h"
+#include "arch_defs.h"
+

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/init.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/init.c?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/init.c (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/init.c Thu Apr 14 06:35:38 2011
@@ -0,0 +1,34 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "acr/jniapi.h"
+#include "acr/debug.h"
+#include "acr/memory.h"
+#include "acr/port.h"
+#include "acr/clazz.h"
+#include "acr/misc.h"
+
+static JavaVM           *_java_vm = 0;
+
+typedef struct tlsd_t
+{
+    /** Private thread strorage list */
+    ACR_RING_HEAD(_cr_tlsd_s, acr_tlsd_t) tlsd;
+    JNIEnv      *env;
+    int          attached;
+    acr_u64_t    id;
+} tlsd_t;
+

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/init.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.bin
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.bin?rev=1092017&view=auto
==============================================================================
Binary file - no diff available.

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.bin
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.mc
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.mc?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.mc (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.mc Thu Apr 14 06:35:38
2011
@@ -0,0 +1,41 @@
+MessageId=0x1
+Severity=Error
+SymbolicName=LOG_MSG_EMERG
+Language=English
+Emerg: %1
+.
+
+MessageId=0x2
+Severity=Error
+SymbolicName=LOG_MSG_ERROR
+Language=English
+Error: %1
+.
+
+MessageId=0x3
+Severity=Warning
+SymbolicName=LOG_MSG_NOTICE
+Language=English
+Notice: %1
+.
+
+MessageId=0x4
+Severity=Warning
+SymbolicName=LOG_MSG_WARN
+Language=English
+Warn: %1
+.
+
+MessageId=0x5
+Severity=Informational
+SymbolicName=LOG_MSG_INFO
+Language=English
+Info: %1
+.
+
+MessageId=0x6
+Severity=Success
+SymbolicName=LOG_MSG_DEBUG
+Language=English
+Debug: %1
+.

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/logmessages.mc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc Thu Apr 14 06:35:38 2011
@@ -0,0 +1,114 @@
+/* Copyright (c) 2011 The MyoMake Project <http://www.myomake.org>
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+#include <windows.h>
+#include "acr/config.h"
+#include "acr/version.h"
+
+LANGUAGE 0x9,0x1
+1 11 logmessages.bin
+
+#define STR_LICENSE \
+  "Licensed under the Apache License, Version 2.0 (the ""License""); "         \
+  "you may not use this file except in compliance with the License. "          \
+  "You may obtain a copy of the License at\r\n"                                \
+  "\r\n"                                                                       \
+  "http://www.apache.org/licenses/LICENSE-2.0\r\n"                             \
+  "\r\n"                                                                       \
+  "Unless required by applicable law or agreed to in writing, software "       \
+  "distributed under the License is distributed on an ""AS IS"" BASIS, "       \
+  "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. "  \
+  "See the License for the specific language governing permissions and "       \
+  "limitations under the License."
+
+#define STR_COPYRIGHT \
+  "Copyright © 2011 Apache Software Foundation.\r\n"                           \
+  "See the NOTICE file distributed with this work for additional "             \
+  "information regarding copyright ownership." 
+
+#define STR_COMPANY         "Apache Software Foundation"
+#define STR_TRADEMARK       "™Apache Software Foundation" 
+#ifndef STR_PRODUCT
+#define STR_PRODUCT         PACKAGE_DESC
+#endif
+#ifndef STR_INTNAME
+#define STR_INTNAME         "lib" PACKAGE_NAME
+#endif
+#ifndef STR_BINNAME
+#define STR_BINNAME         STR_INTNAME ".dll"
+#endif
+
+#define PRIVATE_BUILD       ACR_IS_DEV_VERSION
+#define PRERELEASE_BUILD    ACR_IS_DEV_VERSION
+
+#if PRIVATE_BUILD
+#define STR_PRIVATE         "Initial Prerelease"
+#define STR_SPECIAL         "Basic functionality"
+#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD
+#else
+#define STD_FILEFLAGS 0x0L
+#endif
+
+#if PRERELEASE_BUILD
+#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE
+#else
+#define PSTD_FILEFLAGS STD_FILEFLAGS
+#endif
+
+#ifdef _DEBUG
+#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG
+#else
+#define APP_FILEFLAGS STD_FILEFLAGS
+#endif
+
+#define IDI_MAINICON 101
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST  "commonc.manifest"
+
+1 VERSIONINFO
+FILEVERSION ACR_VERSION_STRING_CSV
+PRODUCTVERSION ACR_VERSION_STRING_CSV
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS APP_FILEFLAGS
+ FILEOS VOS_NT
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments",  STR_LICENSE "\0"
+            VALUE "CompanyName", STR_COMPANY "\0"
+            VALUE "FileDescription", STR_PRODUCT "\0"
+            VALUE "FileVersion", ACR_VERSION_STRING "\0"
+            VALUE "InternalName", STR_INTNAME "\0"
+            VALUE "LegalCopyright", STR_COPYRIGHT "\0"
+            VALUE "LegalTrademarks", STR_TRADEMARK "\0"
+            VALUE "OriginalFilename", STR_BINNAME "\0"
+            VALUE "ProductName", STR_PRODUCT "\0"
+            VALUE "ProductVersion", ACR_VERSION_STRING "\0"
+#if PRIVATE_BUILD
+            VALUE "PrivateBuild", STR_PRIVATE "\0"
+            VALUE "SpecialBuild", STR_SPECIAL "\0"
+#endif
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c Thu Apr 14 06:35:38 2011
@@ -0,0 +1,32 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "acr/jniapi.h"
+#include "acr/string.h"
+
+static const char     _unknown[] = "unknown";
+
+ACR_JNI_EXPORT(jint, Os, getType)(JNI_STDARGS)
+{
+    UNREFERENCED_STDARGS;
+    return ACR_OS_WINDOWS;
+}
+
+
+ACR_JNI_EXPORT(jstring, Os, getSysname)(JNI_STDARGS)
+{
+    return CSTR_TO_JSTRING("windows");
+}

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c Thu Apr 14 06:35:38
2011
@@ -0,0 +1,21 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "acr/string.h"
+#include "acr/port.h"
+
+extern int acr_native_codepage;
+

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c Thu Apr 14 06:35:38 2011
@@ -0,0 +1,18 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "acr/time.h"
+

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c?rev=1092017&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c (added)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c Thu Apr 14 06:35:38 2011
@@ -0,0 +1,19 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "acr/error.h"
+#include "acr/memory.h"
+#include "acr/port.h"

Propchange: commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/sandbox/runtime/trunk/src/main/native/srclib/bzip2/bzlib.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/srclib/bzip2/bzlib.h?rev=1092017&r1=1092016&r2=1092017&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/srclib/bzip2/bzlib.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/srclib/bzip2/bzlib.h Thu Apr 14 06:35:38
2011
@@ -32,27 +32,27 @@ extern "C" {
 /* Prefixed API with m_ so it doesn't
  * interfere with aready loaded bzlib
  */
-#define bz_stream                   _pr_bz_stream
-#define BZ2_bzCompressInit          _pr_BZ2_bzCompressInit
-#define BZ2_bzCompress              _pr_BZ2_bzCompress
-#define BZ2_bzCompressEnd           _pr_BZ2_bzCompressEnd
-#define BZ2_bzDecompressInit        _pr_BZ2_bzDecompressInit
-#define BZ2_bzDecompress            _pr_BZ2_bzDecompress
-#define BZ2_bzDecompressEnd         _pr_BZ2_bzDecompressEnd
-#define BZ2_bzBuffToBuffCompress    _pr_BZ2_bzBuffToBuffCompress
-#define BZ2_bzBuffToBuffDecompress  _pr_BZ2_bzBuffToBuffDecompress
-#define BZ2_bzlibVersion            _pr_BZ2_bzlibVersion
-#define bz_internal_error           _pr_bz_internal_error
-#define BZ2_crc32Table              _pr_BZ2_crc32Table
-#define BZ2_blockSort               _pr_BZ2_blockSort
-#define BZ2_compressBlock           _pr_BZ2_compressBlock
-#define BZ2_bsInitWrite             _pr_BZ2_bsInitWrite
-#define BZ2_hbAssignCodes           _pr_BZ2_hbAssignCodes
-#define BZ2_hbMakeCodeLengths       _pr_BZ2_hbMakeCodeLengths
-#define BZ2_indexIntoF              _pr_BZ2_indexIntoF
-#define BZ2_decompress              _pr_BZ2_decompress
-#define BZ2_hbCreateDecodeTables    _pr_BZ2_hbCreateDecodeTables
-#define BZ2_rNums                   _pr_BZ2_rNums
+#define bz_stream                   _cr_bz_stream
+#define BZ2_bzCompressInit          _cr_BZ2_bzCompressInit
+#define BZ2_bzCompress              _cr_BZ2_bzCompress
+#define BZ2_bzCompressEnd           _cr_BZ2_bzCompressEnd
+#define BZ2_bzDecompressInit        _cr_BZ2_bzDecompressInit
+#define BZ2_bzDecompress            _cr_BZ2_bzDecompress
+#define BZ2_bzDecompressEnd         _cr_BZ2_bzDecompressEnd
+#define BZ2_bzBuffToBuffCompress    _cr_BZ2_bzBuffToBuffCompress
+#define BZ2_bzBuffToBuffDecompress  _cr_BZ2_bzBuffToBuffDecompress
+#define BZ2_bzlibVersion            _cr_BZ2_bzlibVersion
+#define bz_internal_error           _cr_bz_internal_error
+#define BZ2_crc32Table              _cr_BZ2_crc32Table
+#define BZ2_blockSort               _cr_BZ2_blockSort
+#define BZ2_compressBlock           _cr_BZ2_compressBlock
+#define BZ2_bsInitWrite             _cr_BZ2_bsInitWrite
+#define BZ2_hbAssignCodes           _cr_BZ2_hbAssignCodes
+#define BZ2_hbMakeCodeLengths       _cr_BZ2_hbMakeCodeLengths
+#define BZ2_indexIntoF              _cr_BZ2_indexIntoF
+#define BZ2_decompress              _cr_BZ2_decompress
+#define BZ2_hbCreateDecodeTables    _cr_BZ2_hbCreateDecodeTables
+#define BZ2_rNums                   _cr_BZ2_rNums
 
 #define BZ_RUN               0
 #define BZ_FLUSH             1



Mime
View raw message