Changeset 2e8b33f in nscp


Ignore:
Timestamp:
10/07/09 06:57:53 (4 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2, stable
Children:
dbc22d8
Parents:
55e44d4
Message:

Changes to the build system to fix broken psdk.jam libs as well as addition to support building debug symbols.

Files:
1 added
13 edited

Legend:

Unmodified
Added
Removed

  • AutoBuild.h

    r55e44d4 r2e8b33f  
    33// change the FALSE to TRUE for autoincrement of build number 
    44#define INCREMENT_VERSION TRUE 
    5 #define FILEVER        0,3,7,422 
    6 #define PRODUCTVER     0,3,7,422 
    7 #define STRFILEVER     _T("0.3.7.422") 
    8 #define STRPRODUCTVER  _T("0.3.7.422") 
    9 #define STRPRODUCTDATE  _T("2009-10-04") 
     5#define FILEVER        0,3,7,452 
     6#define PRODUCTVER     0,3,7,452 
     7#define STRFILEVER     _T("0.3.7.452") 
     8#define STRPRODUCTVER  _T("0.3.7.452") 
     9#define STRPRODUCTDATE  _T("2009-10-07") 
    1010#endif // AUTOBUILD_H 

  • Jamroot

    r55e44d4 r2e8b33f  
    255255explicit installer_dll ; 
    256256 
    257 all-helpers = installer_dll ; 
    258 alias all-helpers-targets : $(all-helpers) ; 
     257alias all-helpers-targets : installer_dll ; 
    259258explicit all-helpers-targets ; 
    260259 

  • bjam/psdk.jam

    r358cda1 r2e8b33f  
    115115  : # source 
    116116  : # requirements 
    117     <name>Msi 
    118117    <conditional>@requirements 
     118  : # default-build 
    119119  : # usage-requirements 
    120120    <conditional>@usage-requirements 
    … …  
    124124  : # source 
    125125  : # requirements 
    126     <name>bufferoverflowu 
    127126    <conditional>@requirements 
     127  : # default-build 
    128128  : # usage-requirements 
    129129    <conditional>@usage-requirements 
    … …  
    133133  : # source 
    134134  : # requirements 
     135    <conditional>@requirements 
     136  : # default-build 
    135137  : # usage-requirements 
    136138    <conditional>@usage-requirements 

  • bjam/zip.jam

    r55e44d4 r2e8b33f  
    99 
    1010type.register ZIP : zip ; 
    11 generators.register-composing bjam/zip.make-zip : : ZIP ; 
     11type.register FOO : foo ; 
     12 
     13generators.register-composing bjam/zip.make-zip : FOO : ZIP ; 
    1214flags bjam/zip.make-zip SOURCE_FOLDER <source-folder> ; 
    1315flags bjam/zip.make-zip EXCLUDES <exclude> : -x ; 

  • build.bat

    r55e44d4 r2e8b33f  
    22@call env.bat 
    33 
    4 echo :: %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries >> build.log 
    5 %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries 
     4echo :: %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries >> build.log 
     5%jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries 
    66if %ERRORLEVEL% == 1 goto :error 
    77echo :: Result: %ERRORLEVEL% >> build.log 
    … …  
    1212echo :: Result: %ERRORLEVEL% >> build.log 
    1313 
    14 echo :: %jam% --toolset=wix "--wix=%WIX_PATH%" %* build-installer >> build.log 
    15 %jam% --toolset=wix "--wix=%WIX_PATH%" %* build-installer 
     14echo :: %jam% --toolset=wix "--wix=%WIX_PATH%" %1=%2 %3=%4 build-installer >> build.log 
     15%jam% --toolset=wix "--wix=%WIX_PATH%" %1=%2 %3=%4 build-installer 
    1616if %ERRORLEVEL% == 1 goto :error 
    1717echo :: Result: %ERRORLEVEL% >> build.log 

  • env.bat

    r308b6f5 r2e8b33f  
    1313rem SET BOOST_BUILD_PATH=D:\tools\boost-build 
    1414SET BOOST_BUILD_PATH=C:\src\lib-src\boost_1_39_0\tools\build\v2 
     15rem SET BOOST_BUILD_PATH=C:\src\tools\beta\boost-build 
    1516rem BOOST_BUILD_PATH=D:\source\boost-build 
    1617rem # 

  • helpers/build-archive/Jamfile

    r55e44d4 r2e8b33f  
    2727use-project master : ../.. ; 
    2828 
    29 zip $(target) : /master//NSClient++ : <tag>@tag <conditional>@generate-binary-location  ;  
     29zip $(target) : test.foo : <tag>@tag <conditional>@generate-binary-location  ;  
    3030 
    3131explicit $(target) ; 

  • helpers/installer_dll/Jamfile

    r358cda1 r2e8b33f  
    11local target = installer_dll ; 
    22local source = main_dll ; 
    3  
    4 #project  
    5 # : requirements 
    6 # <find-static-library>Msi 
    7 # <library-path>"D:/Program/Microsoft Platform SDK for Windows Server 2003 R2/Lib" 
    8 # ; 
    9  
    10  
    11  
    12 #local lib = [ MATCH "^--psdk-lib=(.*)" : [ modules.peek : ARGV ] ] ; 
    13 #echo "PSDK lib path: $(lib) (change with --psdk-lib=<other path>" ; 
    14  
    15 #lib Msi : : <name>Msi <search>$(lib) ;  
    16 #lib bufferoverflowu : : <name>bufferoverflowu <search>$(lib) ;  
    17 #lib secchk : : <name>secchk <search>$(lib) ;  
    18 #lib secchk : : <name>secchk ;  
    193 
    204lib $(target) 
    … …  
    226  $(source).cpp 
    237  ../../include/ServiceCmd.cpp 
     8  /psdk//Msi 
     9  /psdk//bufferoverflowu 
    2410  : # requirements 
    25   <source>/psdk//Msi 
    26   <source>/psdk//bufferoverflowu 
    2711  <def-file>$(source).def 
    2812  <user-interface>gui 
    2913  <runtime-link>static 
    3014  <threading>multi 
    31  
    3215  : # default build 
    3316  : # usage requirements 

  • helpers/installer_dll_fw/Jamfile

    re7dbac9 r2e8b33f  
    88  firewall.cpp 
    99  /psdk//hnetcfg 
     10  /psdk//bufferoverflowu 
    1011  /psdk//Msi 
    11   /psdk//bufferoverflowu 
    1212  : # requirements 
    1313  <def-file>firewall.def 
    … …  
    1515  <runtime-link>static 
    1616  <threading>multi 
    17   <include>"D:/Program/Microsoft Platform SDK for Windows Server 2003 R2/Include" 
    18 # <include>"C:/Program Files/Microsoft Platform SDK for Windows Server 2003 R2/Include/Atl" 
    19  
    2017  : # default build 
    2118  : # usage requirements 

  • helpers/installer_dll_fw/precomp.h

    r8170e81 r2e8b33f  
    2222#include <msiquery.h> 
    2323//#include <strsafe.h> 
     24#ifdef USE_PSDK 
    2425#include <netfw.h> 
     26#endif 
    2527 
    2628//#include "wcautil.h" 

  • release-build.bat

    r55e44d4 r2e8b33f  
    1515echo :: Result: %ERRORLEVEL% >> build.log 
    1616 
    17 call :build_one variant=debug address-model=32 "--library-path=%TARGET_LIB_x86_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x86%" 
     17call :build_one address-model=32 variant=release debug-symbols=on debug-store=database --build-type=complete "--library-path=%TARGET_LIB_x86_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x86%" 
    1818IF DEFINED _ERROR goto :error 
    19 call :build_one variant=release address-model=32 "--library-path=%TARGET_LIB_x86_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x86%" 
    20 IF DEFINED _ERROR goto :error 
    21 call :build_one variant=debug address-model=64 "--library-path=%TARGET_LIB_x64_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x64%" 
    22 IF DEFINED _ERROR goto :error 
    23 call :build_one variant=release address-model=64 "--library-path=%TARGET_LIB_x64_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x64%" 
     19call :build_one address-model=64 variant=release debug-symbols=on debug-store=database --build-type=complete "--library-path=%TARGET_LIB_x64_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x64%" 
    2420IF DEFINED _ERROR goto :error 
    2521rem call build.bat runtime-link=static variant=release architecture=ia64 --library-path=%TARGET_LIB_IA64_DIR% 

  • x64-build.bat

    r358cda1 r2e8b33f  
    11@echo off 
     2@call env.bat 
    23 
    3 SET BOOST_BUILD_PATH=D:\tools\boost-build 
    4 rem SET BOOST_BUILD_PATH=D:\source\libs-c\boost_1_37_0\tools\build\v2 
    5 rem SET TOOLS_DIR=d:\source\tools\;C:\Program Files\7-Zip\ 
    6 SET TOOLS_DIR=d:\source\tools\;%ProgramFiles%\7-Zip\ 
     4SET _ERROR= 
     5echo Starting build > build.log 
    76 
    87 
    9 SET openssl=D:\source\libs-c\openssl-0.9.8g\include 
    10 SET boost=D:\source\libs-c\boost_1_34_1 
    11 rem SET boost=D:\source\libs-c\boost_1_35_0 
     8rem call :build_hdrs 
     9IF DEFINED _ERROR goto :error 
     10rem call :build_src 
     11IF DEFINED _ERROR goto :error     
    1212 
    13 set TARGET_LIB_DIR=D:\source\lib 
    14 set TARGET_LIB_x86_DIR=%TARGET_LIB_DIR%\x86 
    15 set TARGET_LIB_x64_DIR=%TARGET_LIB_DIR%\x64 
    16 set TARGET_LIB_IA64_DIR=%TARGET_LIB_DIR%\IA64 
    17  
    18 set PATH=%PATH%;%TOOLS_DIR% 
    19  
    20 REM build x64 (Amd64, Emt64) binary 
    21 SET version=x64 
    22 call build.bat runtime-link=static  variant=release address-model=64 --library-path=%TARGET_LIB_x64_DIR% 
    23 if %ERRORLEVEL% == -1 goto :error 
     13call :build_one address-model=64 variant=release debug-symbols=on debug-store=database --build-type=complete "--library-path=%TARGET_LIB_x86_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x86%" 
     14IF DEFINED _ERROR goto :error 
    2415 
    2516echo ************* 
    … …  
    2819echo *           * 
    2920echo ************* 
    30  
    3121goto :eof 
    3222 
    33 :error 
     23:build_hdrs 
     24echo %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log 
     25%jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers 
     26if %ERRORLEVEL% == -1 goto :error_one 
     27echo :: Result: %ERRORLEVEL% >> build.log 
     28goto :eof 
     29 
     30:build_src 
     31echo %jam% --toolset=msvc source-archive >> build.log 
     32%jam% --toolset=msvc source-archive 
     33if %ERRORLEVEL% == -1 goto :error_one 
     34echo :: Result: %ERRORLEVEL% >> build.log 
     35goto :eof 
     36 
     37:build_one 
     38echo build.bat %* >> build.log 
     39call build.bat %* 
     40if %ERRORLEVEL% == -1 goto :error_one 
     41echo Result: %ERRORLEVEL% >> build.log 
     42goto :eof 
     43 
     44:error_one 
    3445echo ********************* 
    3546echo *                   * 
    3647echo *    E R R O R      * 
    3748echo *                   * 
    38 echo * When building %version% * 
     49echo ********************* 
     50set _ERROR=1 
     51exit /b -1 
     52goto :eof 
     53 
     54:error 
     55echo :: Error: %ERRORLEVEL% >> build.log 
     56echo ********************* 
     57echo *                   * 
     58echo *    E R R O R      * 
    3959echo *                   * 
    4060echo ********************* 
    41  
     61type build.log 

  • x86-build.bat

    r358cda1 r2e8b33f  
    11@echo off 
     2@call env.bat 
    23 
    3 SET BOOST_BUILD_PATH=D:\tools\boost-build 
    4 rem SET BOOST_BUILD_PATH=D:\source\libs-c\boost_1_37_0\tools\build\v2 
    5 rem SET TOOLS_DIR=d:\source\tools\;C:\Program Files\7-Zip\ 
    6 SET TOOLS_DIR=d:\source\tools\;%ProgramFiles%\7-Zip\ 
    7 SET PLATTFORM_SDK_LIB="D:/Program/Microsoft Platform SDK for Windows Server 2003 R2/Lib" 
    8 SET PLATTFORM_SDK_LIB_x86=%PLATTFORM_SDK_LIB% 
    9 SET PLATTFORM_SDK_LIB_x64=%PLATTFORM_SDK_LIB%/AMD64/msi 
    10 SET PLATTFORM_SDK_LIB_IA64=%PLATTFORM_SDK_LIB%/IA64 
     4SET _ERROR= 
     5echo Starting build > build.log 
    116 
    127 
     8rem call :build_hdrs 
     9IF DEFINED _ERROR goto :error 
     10rem call :build_src 
     11IF DEFINED _ERROR goto :error     
    1312 
    14 SET openssl=D:\source\libs-c\openssl-0.9.8g\include 
    15 SET boost=D:\source\libs-c\boost_1_34_1 
    16 rem SET boost=D:\source\libs-c\boost_1_35_0 
    17  
    18 set PSDKLIB= 
    19 set TARGET_LIB_DIR=D:\source\lib 
    20 set TARGET_LIB_x86_DIR=%TARGET_LIB_DIR%\x86 
    21 set TARGET_LIB_x64_DIR=%TARGET_LIB_DIR%\x64 
    22 set TARGET_LIB_IA64_DIR=%TARGET_LIB_DIR%\IA64 
    23  
    24 set PATH=%PATH%;%TOOLS_DIR% 
    25  
    26 REM build x86 binary 
    27 SET version=x86 
    28 SET cmdline=build.bat runtime-link=static variant=release address-model=32 --library-path=%TARGET_LIB_x86_DIR% --psdk-lib=%PLATTFORM_SDK_LIB_x86% 
    29 call build.bat runtime-link=static variant=release address-model=32 --library-path=%TARGET_LIB_x86_DIR% --psdk-lib=%PLATTFORM_SDK_LIB_x86% 
    30 if %ERRORLEVEL% == -1 goto :error 
     13call :build_one address-model=32 variant=release debug-symbols=on debug-store=database --build-type=complete "--library-path=%TARGET_LIB_x86_DIR%" "--with-psdk-lib=%PLATTFORM_SDK_LIB_x86%" 
     14IF DEFINED _ERROR goto :error 
    3115 
    3216echo ************* 
    … …  
    3519echo *           * 
    3620echo ************* 
    37  
    3821goto :eof 
    3922 
    40 :error 
     23:build_hdrs 
     24echo %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log 
     25%jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers 
     26if %ERRORLEVEL% == -1 goto :error_one 
     27echo :: Result: %ERRORLEVEL% >> build.log 
     28goto :eof 
     29 
     30:build_src 
     31echo %jam% --toolset=msvc source-archive >> build.log 
     32%jam% --toolset=msvc source-archive 
     33if %ERRORLEVEL% == -1 goto :error_one 
     34echo :: Result: %ERRORLEVEL% >> build.log 
     35goto :eof 
     36 
     37:build_one 
     38echo build.bat %* >> build.log 
     39call build.bat %* 
     40if %ERRORLEVEL% == -1 goto :error_one 
     41echo Result: %ERRORLEVEL% >> build.log 
     42goto :eof 
     43 
     44:error_one 
    4145echo ********************* 
    4246echo *                   * 
    4347echo *    E R R O R      * 
    4448echo *                   * 
    45 echo * When building %version% * 
     49echo ********************* 
     50set _ERROR=1 
     51exit /b -1 
     52goto :eof 
     53 
     54:error 
     55echo :: Error: %ERRORLEVEL% >> build.log 
     56echo ********************* 
     57echo *                   * 
     58echo *    E R R O R      * 
    4659echo *                   * 
    4760echo ********************* 
    48 echo %cmdline% 
     61type build.log 
Note: See TracChangeset for help on using the changeset viewer.