generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-17 20:06:52 +01:00
Code Issues Projects Releases Wiki Activity

update gitignore to allow openssl binaries; update Progen to skip 32 suffix for 32-bit binaries

Browse Source
This commit is contained in:
Alex Fabijanic 2015-04-21 23:36:25 -05:00
parent 7f8c823e77
commit 62597585a3
4 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.gitignore vendored
View File

@ -97,10 +97,10 @@ release_static_md/
debug_static_md/ debug_static_md/
release_static_mt/ release_static_mt/
debug_static_mt/ debug_static_mt/
bin/ bin/*
bin64/ bin64/*
lib/ lib/*
lib64/ lib64/*
pocomsg.h pocomsg.h
# Eclipse generated files # # Eclipse generated files #
@ -113,3 +113,22 @@ cmake-build/
# Temporary files # # Temporary files #
################### ###################
*.bak *.bak
# openssl binaries #
####################
!openssl/out/win32/bin/debug/*.dll
!openssl/out/win32/bin/debug/*.lib
!openssl/out/win32/bin/release/*.dll
!openssl/out/win32/bin/release/*.lib
!openssl/out/win64/bin/debug/*.dll
!openssl/out/win64/bin/debug/*.lib
!openssl/out/win64/bin/release/*.dll
!openssl/out/win64/bin/release/*.lib
!openssl/out/win32/lib/debug/*.lib
!openssl/out/win32/lib/debug/*.pdb
!openssl/out/win32/lib/release/*.lib
!openssl/out/win64/lib/debug/*.lib
!openssl/out/win64/lib/debug/*.pdb
!openssl/out/win64/lib/release/*.lib

13
Crypto/Crypto.progen
View File

@ -18,11 +18,12 @@ vc.project.linker.dependencies.release_static_md = Crypt32.lib
vc.project.linker.dependencies.debug_static_mt = Crypt32.lib vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
vc.project.linker.dependencies.release_static_mt = Crypt32.lib vc.project.linker.dependencies.release_static_mt = Crypt32.lib
bits = ${vc.project.platform.bits} bits = ${vc.project.platform.bits}
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}\\* dirbits = ${vc.project.platform.bindir.suffix}
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}\\* 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}\\*
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}\\* 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}\\*
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}\\* 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}\\*
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}\\* 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}\\*
vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${bits}\\* 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}\\*
vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\*
vc.solution.create = true vc.solution.create = true
vc.solution.include = testsuite\\TestSuite vc.solution.include = testsuite\\TestSuite

13
NetSSL_OpenSSL/NetSSL_OpenSSL.progen
View File

@ -20,11 +20,12 @@ vc.project.linker.dependencies.release_static_md = Crypt32.lib
vc.project.linker.dependencies.debug_static_mt = Crypt32.lib vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
vc.project.linker.dependencies.release_static_mt = Crypt32.lib vc.project.linker.dependencies.release_static_mt = Crypt32.lib
bits = ${vc.project.platform.bits} bits = ${vc.project.platform.bits}
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}\\* dirbits = ${vc.project.platform.bindir.suffix}
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}\\* 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}\\*
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}\\* 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}\\*
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}\\* 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}\\*
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}\\* 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}\\*
vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${bits}\\* 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}\\*
vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\*
vc.solution.create = true vc.solution.create = true
vc.solution.include = testsuite\\TestSuite vc.solution.include = testsuite\\TestSuite

13
ProGen/src/ProGen.cpp
View File

@ -912,9 +912,16 @@ protected:
templatePath.pushDirectory(tool); templatePath.pushDirectory(tool);
templatePath.pushDirectory(platform); templatePath.pushDirectory(platform);
templatePath.pushDirectory(projectType); templatePath.pushDirectory(projectType);
if (platform == "Win32") pProjectConfig->setString("vc.project.platform.bits", "32"); if ((platform == "Win32") || (platform == "WinCE"))
else if (platform == "x64") pProjectConfig->setString("vc.project.platform.bits", "64"); {
else if (platform == "WinCE") pProjectConfig->setString("vc.project.platform.bits", "32"); pProjectConfig->setString("vc.project.platform.bits", "32");
pProjectConfig->setString("vc.project.platform.bindir.suffix", "");
}
else if (platform == "x64")
{
pProjectConfig->setString("vc.project.platform.bits", "64");
pProjectConfig->setString("vc.project.platform.bindir.suffix", "64");
}
else throw Poco::NotFoundException(Poco::format("Unknown platform: %s", platform)); else throw Poco::NotFoundException(Poco::format("Unknown platform: %s", platform));
generateProject(*pProjectConfig, projectPath, templatePath, platform, tool); generateProject(*pProjectConfig, projectPath, templatePath, platform, tool);
} }