Skip to content

Commit 6259758

Browse files
aleks-faleks-f
committed
update gitignore to allow openssl binaries; update Progen to skip 32 suffix for 32-bit binaries
1 parent 7f8c823 commit 6259758

4 files changed

Lines changed: 47 additions & 19 deletions

File tree

‎.gitignore‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ release_static_md/
9797
debug_static_md/
9898
release_static_mt/
9999
debug_static_mt/
100-
bin/
101-
bin64/
102-
lib/
103-
lib64/
100+
bin/*
101+
bin64/*
102+
lib/*
103+
lib64/*
104104
pocomsg.h
105105

106106
# Eclipse generated files #
@@ -113,3 +113,22 @@ cmake-build/
113113
# Temporary files #
114114
###################
115115
*.bak
116+
117+
# openssl binaries #
118+
####################
119+
120+
!openssl/out/win32/bin/debug/*.dll
121+
!openssl/out/win32/bin/debug/*.lib
122+
!openssl/out/win32/bin/release/*.dll
123+
!openssl/out/win32/bin/release/*.lib
124+
!openssl/out/win64/bin/debug/*.dll
125+
!openssl/out/win64/bin/debug/*.lib
126+
!openssl/out/win64/bin/release/*.dll
127+
!openssl/out/win64/bin/release/*.lib
128+
129+
!openssl/out/win32/lib/debug/*.lib
130+
!openssl/out/win32/lib/debug/*.pdb
131+
!openssl/out/win32/lib/release/*.lib
132+
!openssl/out/win64/lib/debug/*.lib
133+
!openssl/out/win64/lib/debug/*.pdb
134+
!openssl/out/win64/lib/release/*.lib

‎Crypto/Crypto.progen‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ vc.project.linker.dependencies.release_static_md = Crypt32.lib
1818
vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
1919
vc.project.linker.dependencies.release_static_mt = Crypt32.lib
2020
bits = ${vc.project.platform.bits}
21-
vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\*
22-
vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\*
23-
vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${bits}\\*
24-
vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\*
25-
vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\*
26-
vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${bits}\\*
21+
dirbits = ${vc.project.platform.bindir.suffix}
22+
vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
23+
vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
24+
vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${dirbits}\\*
25+
vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
26+
vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
27+
vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\*
2728
vc.solution.create = true
2829
vc.solution.include = testsuite\\TestSuite

‎NetSSL_OpenSSL/NetSSL_OpenSSL.progen‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ vc.project.linker.dependencies.release_static_md = Crypt32.lib
2020
vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
2121
vc.project.linker.dependencies.release_static_mt = Crypt32.lib
2222
bits = ${vc.project.platform.bits}
23-
vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\*
24-
vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\*
25-
vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${bits}\\*
26-
vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\*
27-
vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\*
28-
vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${bits}\\*
23+
dirbits = ${vc.project.platform.bindir.suffix}
24+
vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
25+
vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
26+
vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${dirbits}\\*
27+
vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
28+
vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
29+
vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\*
2930
vc.solution.create = true
3031
vc.solution.include = testsuite\\TestSuite

‎ProGen/src/ProGen.cpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -912,9 +912,16 @@ class ProGenApp: public Application
912912
templatePath.pushDirectory(tool);
913913
templatePath.pushDirectory(platform);
914914
templatePath.pushDirectory(projectType);
915-
if (platform == "Win32") pProjectConfig->setString("vc.project.platform.bits", "32");
916-
else if (platform == "x64") pProjectConfig->setString("vc.project.platform.bits", "64");
917-
else if (platform == "WinCE") pProjectConfig->setString("vc.project.platform.bits", "32");
915+
if ((platform == "Win32") || (platform == "WinCE"))
916+
{
917+
pProjectConfig->setString("vc.project.platform.bits", "32");
918+
pProjectConfig->setString("vc.project.platform.bindir.suffix", "");
919+
}
920+
else if (platform == "x64")
921+
{
922+
pProjectConfig->setString("vc.project.platform.bits", "64");
923+
pProjectConfig->setString("vc.project.platform.bindir.suffix", "64");
924+
}
918925
else throw Poco::NotFoundException(Poco::format("Unknown platform: %s", platform));
919926
generateProject(*pProjectConfig, projectPath, templatePath, platform, tool);
920927
}

0 commit comments

Comments
 (0)