Skip to content

Commit 48ec697

Browse files
ochafikochafik
committed
Flattened Runtime project hierarchy, merged -parent and -root artifacts
1 parent 77f1b2c commit 48ec697

532 files changed

Lines changed: 20054 additions & 21075 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎libraries/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ Akkhack
1313
.project
1414
.classpath
1515
*.class
16+
velocity.log

libraries/Runtime/BridJ/.gitignore renamed to libraries/BridJ/.gitignore

File renamed without changes.

libraries/Runtime/BridJ/BuildNative renamed to libraries/BridJ/BuildNative

File renamed without changes.

libraries/Runtime/BridJ/BuildNative.cmd renamed to libraries/BridJ/BuildNative.cmd

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
@echo off
2-
setlocal enabledelayedexpansion
3-
4-
pushd .
5-
cd src\main\cpp\buildsys\vs2008
6-
7-
call SetEnv.cmd
8-
call CopyRulesIfNeeded.cmd
9-
10-
pushd ..
11-
call GenerateJNIStubs.cmd
12-
popd
13-
14-
if "%CONFIG%" == "" set CONFIGS=Release Debug
15-
if not "%CONFIG%" == "" set CONFIGS=%CONFIG%
16-
if "%CONFIG%" == "" set CONFIG=Release
17-
18-
for %%C in (%CONFIGS%) do (
19-
REM if exists "c:\Program Files (x86)"
20-
call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
21-
REM if not exists "c:\Program Files (x86)" call "c:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
22-
devenv /nologo /useenv /Build "%%C|Win32" bridj.sln
23-
echo.
24-
25-
REM if exists "c:\Program Files (x86)"
26-
call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86_amd64
27-
REM if not exists "c:\Program Files (x86)" call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86_amd64
28-
devenv /nologo /useenv /Build "%%C|x64" bridj.sln
29-
echo.
30-
)
31-
32-
for %%T in (win32 win64) do (
33-
del ..\..\..\resources\org\bridj\lib\%%T\*.dll
34-
del ..\..\..\..\test\resources\org\bridj\lib\%%T\*.dll
35-
)
36-
37-
rem set CONFIG=Debug
38-
rem set CONFIG=Release
39-
40-
copy %CONFIG%\bridj.dll ..\..\..\resources\org\bridj\lib\win32
41-
copy %CONFIG%\test.dll ..\..\..\..\test\resources\org\bridj\lib\win32
42-
43-
copy x64\%CONFIG%\bridj.dll ..\..\..\resources\org\bridj\lib\win64
44-
copy x64\%CONFIG%\test.dll ..\..\..\..\test\resources\org\bridj\lib\win64
45-
46-
rem if "%CONFIG%" == "Debug" (
47-
48-
copy %CONFIG%\bridj.pdb ..\..\..\resources\org\bridj\lib\win32
49-
copy %CONFIG%\test.pdb ..\..\..\..\test\resources\org\bridj\lib\win32
50-
51-
copy x64\%CONFIG%\bridj.pdb ..\..\..\resources\org\bridj\lib\win64
52-
copy x64\%CONFIG%\test.pdb ..\..\..\..\test\resources\org\bridj\lib\win64
53-
rem )
54-
rem echo Copied files from %CONFIG% :
55-
rem dir %CONFIG%\bridj.dll x64\%CONFIG%\bridj.dll
56-
57-
58-
popd
59-
60-
if not "%1" == "nopause" pause
1+
@echo off
2+
setlocal enabledelayedexpansion
3+
4+
pushd .
5+
cd src\main\cpp\buildsys\vs2008
6+
7+
call SetEnv.cmd
8+
call CopyRulesIfNeeded.cmd
9+
10+
pushd ..
11+
call GenerateJNIStubs.cmd
12+
popd
13+
14+
if "%CONFIG%" == "" set CONFIGS=Release Debug
15+
if not "%CONFIG%" == "" set CONFIGS=%CONFIG%
16+
if "%CONFIG%" == "" set CONFIG=Release
17+
18+
for %%C in (%CONFIGS%) do (
19+
REM if exists "c:\Program Files (x86)"
20+
call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
21+
REM if not exists "c:\Program Files (x86)" call "c:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
22+
devenv /nologo /useenv /Build "%%C|Win32" bridj.sln
23+
echo.
24+
25+
REM if exists "c:\Program Files (x86)"
26+
call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86_amd64
27+
REM if not exists "c:\Program Files (x86)" call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86_amd64
28+
devenv /nologo /useenv /Build "%%C|x64" bridj.sln
29+
echo.
30+
)
31+
32+
for %%T in (win32 win64) do (
33+
del ..\..\..\resources\org\bridj\lib\%%T\*.dll
34+
del ..\..\..\..\test\resources\org\bridj\lib\%%T\*.dll
35+
)
36+
37+
rem set CONFIG=Debug
38+
rem set CONFIG=Release
39+
40+
copy %CONFIG%\bridj.dll ..\..\..\resources\org\bridj\lib\win32
41+
copy %CONFIG%\test.dll ..\..\..\..\test\resources\org\bridj\lib\win32
42+
43+
copy x64\%CONFIG%\bridj.dll ..\..\..\resources\org\bridj\lib\win64
44+
copy x64\%CONFIG%\test.dll ..\..\..\..\test\resources\org\bridj\lib\win64
45+
46+
rem if "%CONFIG%" == "Debug" (
47+
48+
copy %CONFIG%\bridj.pdb ..\..\..\resources\org\bridj\lib\win32
49+
copy %CONFIG%\test.pdb ..\..\..\..\test\resources\org\bridj\lib\win32
50+
51+
copy x64\%CONFIG%\bridj.pdb ..\..\..\resources\org\bridj\lib\win64
52+
copy x64\%CONFIG%\test.pdb ..\..\..\..\test\resources\org\bridj\lib\win64
53+
rem )
54+
rem echo Copied files from %CONFIG% :
55+
rem dir %CONFIG%\bridj.dll x64\%CONFIG%\bridj.dll
56+
57+
58+
popd
59+
60+
if not "%1" == "nopause" pause

libraries/Runtime/BridJ/BuildNative_Debug.cmd renamed to libraries/BridJ/BuildNative_Debug.cmd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@echo off
2-
setlocal enabledelayedexpansion
3-
4-
set CONFIG=Debug
5-
call BuildNative.cmd
1+
@echo off
2+
setlocal enabledelayedexpansion
3+
4+
set CONFIG=Debug
5+
call BuildNative.cmd

libraries/Runtime/BridJ/CHANGELOG renamed to libraries/BridJ/CHANGELOG

Lines changed: 195 additions & 195 deletions
Large diffs are not rendered by default.

libraries/Runtime/BridJ/CleanNative renamed to libraries/BridJ/CleanNative

File renamed without changes.

libraries/Runtime/BridJ/CleanNative.cmd renamed to libraries/BridJ/CleanNative.cmd

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
@echo off
2-
setlocal enabledelayedexpansion
3-
4-
pushd .
5-
cd src\main\cpp\buildsys\vs2008
6-
7-
for /D %%F in (dyncall32 dyncall64 dyncallback32 dyncallback64 dynload bridj32 bridj64) do (
8-
for %%S in (x64 Debug Release obj build) do (
9-
if exist "%%F\%%S" (
10-
echo Deleting "%%F\%%S"
11-
rmdir /S /Q "%%F\%%S"
12-
)
13-
)
14-
)
15-
16-
del /Q x64\Release\*.*
17-
del /Q x64\Debug\*.*
18-
del /Q Release\*.*
19-
del /Q Debug\*.*
20-
21-
del /Q *.ncb
22-
23-
popd
24-
25-
if not "%1" == "nopause" pause
1+
@echo off
2+
setlocal enabledelayedexpansion
3+
4+
pushd .
5+
cd src\main\cpp\buildsys\vs2008
6+
7+
for /D %%F in (dyncall32 dyncall64 dyncallback32 dyncallback64 dynload bridj32 bridj64) do (
8+
for %%S in (x64 Debug Release obj build) do (
9+
if exist "%%F\%%S" (
10+
echo Deleting "%%F\%%S"
11+
rmdir /S /Q "%%F\%%S"
12+
)
13+
)
14+
)
15+
16+
del /Q x64\Release\*.*
17+
del /Q x64\Debug\*.*
18+
del /Q Release\*.*
19+
del /Q Debug\*.*
20+
21+
del /Q *.ncb
22+
23+
popd
24+
25+
if not "%1" == "nopause" pause

libraries/Runtime/BridJ/CommitBinaries renamed to libraries/BridJ/CommitBinaries

File renamed without changes.

libraries/Runtime/BridJ/CopyVisualStudioBinaries.cmd renamed to libraries/BridJ/CopyVisualStudioBinaries.cmd

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
@echo off
2-
setlocal
3-
4-
set VS_DIR=src\main\cpp\buildsys\vs2008\Debug
5-
6-
copy %VS_DIR%\bridj.dll src\main\resources\win32
7-
copy %VS_DIR%\bridj.pdb src\main\resources\win32
8-
copy %VS_DIR%\test.dll src\test\resources\win32
9-
copy %VS_DIR%\test.pdb src\test\resources\win32
10-
11-
rem pause
1+
@echo off
2+
setlocal
3+
4+
set VS_DIR=src\main\cpp\buildsys\vs2008\Debug
5+
6+
copy %VS_DIR%\bridj.dll src\main\resources\win32
7+
copy %VS_DIR%\bridj.pdb src\main\resources\win32
8+
copy %VS_DIR%\test.dll src\test\resources\win32
9+
copy %VS_DIR%\test.pdb src\test\resources\win32
10+
11+
rem pause

0 commit comments

Comments
 (0)