Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite30f476

Browse files
committed
Prepared for VS 2017
1 parenta8de3a7 commite30f476

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

‎build/build64.cmd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
SETARCH=X64
22
SETSDK=MSVC2017
33
SETPG_MAJOR_VERSION=12
4-
SETPG_PATCH_VERSION=0
5-
SETPRODUCT_NAME=PostgreSQL
6-
remSET PRODUCT_NAME=PostgreSQL 1C
7-
remSET ONE_C=YES
8-
remSET PGURL=http://repo.postgrespro.ru/1c-10-beta/src/postgrespro-1c-10.3.tar.bz2
4+
SETPG_PATCH_VERSION=1
5+
remSET PRODUCT_NAME=PostgreSQL
6+
SETPRODUCT_NAME=PostgreSQL 1C
7+
SETONE_C=YES
8+
SETPGURL=http://localrepo.l.postgrespro.ru/dev/src/postgresql-%PG_MAJOR_VERSION%.%PG_PATCH_VERSION%.tar.bz2
99
SETPERL5LIB=.
1010
SETMSBFLAGS=/m
1111
call run.cmd%1

‎build/helpers/dependencies.cmd

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ rm -rf %DEPENDENCIES_SRC_DIR%
1010
MKDIR%DEPENDENCIES_SRC_DIR%
1111
MKDIR%DOWNLOADS_DIR%
1212

13+
IF%SDK%== MSVC2015 (
14+
SETWindowsTargetPlatformVersion=%WindowsSDKVersion%
15+
)
16+
IF%SDK%== MSVC2017 (
17+
SETWindowsTargetPlatformVersion=%WindowsSDKVersion%
18+
)
19+
1320
REM TO-DO: overwrite to build rules
1421
:DOWNLOAD_MSYS_UTILS
1522
TITLE Download msys utils...
@@ -27,8 +34,8 @@ tar xf libiconv-%ICONV_VER%.tar.gz -C %DEPENDENCIES_SRC_UDIR% || GOTO :ERROR
2734
CD /D%DEPENDENCIES_SRC_DIR%\libiconv-%ICONV_VER%*
2835
cp -v%ROOT%/patches/libiconv/libiconv-%ICONV_VER%-%SDK%.patch libiconv.patch
2936
patch -f -p0< libiconv.patch||GOTO :ERROR
30-
IF%ARCH%== X64 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset%/p:WindowsTargetPlatformVersion=%WindowsSDKVersion%||GOTO :ERROR
31-
IF%ARCH%== X86 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:PlatformToolset=%PlatformToolset%/p:WindowsTargetPlatformVersion=%WindowsSDKVersion%||GOTO :ERROR
37+
IF%ARCH%== X64 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
38+
IF%ARCH%== X86 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
3239
cp -av include%DEPENDENCIES_BIN_DIR%\iconv||GOTO :ERROR
3340
cp -av iconv.h%DEPENDENCIES_BIN_DIR%\iconv\include||GOTO :ERROR
3441
cp -av config.h%DEPENDENCIES_BIN_DIR%\iconv\include||GOTO :ERROR
@@ -74,8 +81,8 @@ IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid.sln || GOTO :ERROR
7481
IF%ARCH%== X64 sed -i 's/Win32/x64/g' ossp_uuid\ossp_uuid.vcxproj||GOTO :ERROR
7582
IF%ARCH%== X64 sed -i 's/Win32/x64/g' example\example.vcxproj||GOTO :ERROR
7683
IF%ARCH%== X64 sed -i 's/Win32/x64/g' uuid_cli\uuid_cli.vcxproj||GOTO :ERROR
77-
IF%ARCH%== X64 msbuild ossp_uuid.sln /m /p:Configuration=Release /p:Platform=x64/p:WindowsTargetPlatformVersion=%WindowsSDKVersion%||GOTO :ERROR
78-
IF%ARCH%== X86 msbuild ossp_uuid.sln /m /p:Configuration=Release/p:WindowsTargetPlatformVersion=%WindowsSDKVersion%||GOTO :ERROR
84+
IF%ARCH%== X64 msbuild ossp_uuid.sln /m /p:Configuration=Release /p:Platform=x64||GOTO :ERROR
85+
IF%ARCH%== X86 msbuild ossp_uuid.sln /m /p:Configuration=Release||GOTO :ERROR
7986
MKDIR%DEPENDENCIES_BIN_DIR%\uuid\lib
8087
cp -av include%DEPENDENCIES_BIN_DIR%\uuid||GOTO :ERROR
8188
IF%ARCH%== X64 cp -av x64\Release\ossp_uuid.lib%DEPENDENCIES_BIN_DIR%\uuid\lib\uuid.lib||GOTO :ERROR
@@ -169,8 +176,8 @@ tar xf gettext-%GETTEXT_VER%.tar.gz -C %DEPENDENCIES_SRC_UDIR% || GOTO :ERROR
169176
CD /D%DEPENDENCIES_SRC_DIR%\gettext-*
170177
cp -v%ROOT%/patches/gettext/gettext-%GETTEXT_VER%-%SDK%.patch gettext.patch
171178
patch -f -p0< gettext.patch||GOTO :ERROR
172-
IF%ARCH%== X64 msbuild libintl.vcxproj /m /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset%/p:WindowsTargetPlatformVersion=%WindowsSDKVersion%||GOTO :ERROR
173-
IF%ARCH%== X86 msbuild libintl.vcxproj /m /p:Configuration=Release /p:PlatformToolset=%PlatformToolset%/p:WindowsTargetPlatformVersion=%WindowsSDKVersion%||GOTO :ERROR
179+
IF%ARCH%== X64 msbuild libintl.vcxproj /m /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
180+
IF%ARCH%== X86 msbuild libintl.vcxproj /m /p:Configuration=Release /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
174181
MKDIR%DEPENDENCIES_BIN_DIR%\libintl\lib%DEPENDENCIES_BIN_DIR%\libintl\include
175182
cp -v Release*/*.dll%DEPENDENCIES_BIN_DIR%\libintl\lib||GOTO :ERROR
176183
cp -v Release*/*.lib%DEPENDENCIES_BIN_DIR%\libintl\lib||GOTO :ERROR
@@ -202,8 +209,8 @@ rm -rf %DEPENDENCIES_BIN_DIR%\icu %DEPENDENCIES_SRC_DIR%\icu
202209
MKDIR%DEPENDENCIES_BIN_DIR%\icu
203210
7z x icu4c-56_1-src.zip -o%DEPENDENCIES_SRC_DIR% -y
204211
CD /D%DEPENDENCIES_SRC_DIR%\icu
205-
IF%ARCH%== X86 msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:PlatformToolset=%PlatformToolset%/p:WindowsTargetPlatformVersion=%WindowsSDKVersion%||GOTO :ERROR
206-
IF%ARCH%== X64 msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=x64 /p:PlatformToolset=%PlatformToolset%/p:WindowsTargetPlatformVersion=%WindowsSDKVersion%||GOTO :ERROR
212+
IF%ARCH%== X86 msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
213+
IF%ARCH%== X64 msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=x64 /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
207214
IF%ARCH%== X64 (
208215
cp -va%DEPENDENCIES_SRC_DIR%\icu\bin64%DEPENDENCIES_BIN_DIR%\icu\bin||GOTO :ERROR
209216
cp -va%DEPENDENCIES_SRC_DIR%\icu\lib64%DEPENDENCIES_BIN_DIR%\icu\lib||GOTO :ERROR

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp