Skip to content

Commit 6af151b

Browse files
committed
Move all patches to the 'patches' directory and
all CMake-related stuff to the 'cmake' directory so that the root directory is clean
1 parent a2c0c43 commit 6af151b

15 files changed

+87
-104
lines changed

CMakeLists.txt renamed to cmake/CMakeLists.txt

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ cmake_minimum_required(VERSION 2.8)
99

1010
include (ExternalProject)
1111

12-
set(WINST_PREFIX ${PROJECT_SOURCE_DIR}/prefix)
12+
# This variable is set in the bootstrapping script (winst/winst.bat)
13+
#set(WINST_PREFIX ${PROJECT_SOURCE_DIR}/prefix)
14+
#set(WINST_BASEDIR ${PROJECT_SOURCE_DIR}/..
1315

1416
# Make sure we use bootstrapped dependencies
1517
set(CMAKE_PREFIX_PATH ${WINST_PREFIX} )
@@ -172,7 +174,7 @@ if (FETCH_ONLY )
172174
foreach( pkg ${_PACKAGES} )
173175
message( STATUS "Downloading ${pkg}" )
174176
get_filename_component( fn ${${pkg}_URL} NAME )
175-
file( DOWNLOAD ${${pkg}_URL} ${PROJECT_SOURCE_DIR}/downloads/${fn} EXPECTED_MD5 ${${pkg}_MD5} SHOW_PROGRESS )
177+
file( DOWNLOAD ${${pkg}_URL} ${WINST_BASEDIR}/downloads/${fn} EXPECTED_MD5 ${${pkg}_MD5} SHOW_PROGRESS )
176178
endforeach(pkg)
177179

178180
file( WRITE ${PROJECT_BINARY_DIR}/fetch-only "" )
@@ -182,7 +184,7 @@ ELSE ( FETCH_ONLY )
182184
# GNU patch
183185
if( WIN32 AND NOT UNIX )
184186
ExternalProject_Add( patch
185-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
187+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
186188
URL ${patch_URL}
187189
URL_MD5 ${patch_MD5}
188190
CONFIGURE_COMMAND ""
@@ -198,7 +200,7 @@ ELSE ( FETCH_ONLY )
198200
set( PATCH_EXECUTABLE ${WINST_PREFIX}\\bin\\patch.exe )
199201
else( WIN32 AND NOT UNIX )
200202
ExternalProject_Add( patch
201-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
203+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
202204
URL ${patch_URL}
203205
URL_MD5 ${patch_MD5}
204206
CONFIGURE_COMMAND ./configure --prefix=${WINST_PREFIX}
@@ -221,7 +223,7 @@ ELSE ( FETCH_ONLY )
221223
# Netwide Assembler
222224
if( WIN32 AND NOT UNIX )
223225
ExternalProject_Add( nasm
224-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
226+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
225227
URL ${nasm_URL}
226228
URL_MD5 ${nasm_MD5}
227229
CONFIGURE_COMMAND ""
@@ -236,7 +238,7 @@ ELSE ( FETCH_ONLY )
236238
)
237239
else( WIN32 AND NOT UNIX )
238240
ExternalProject_Add( nasm
239-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
241+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
240242
URL ${nasm_URL}
241243
URL_MD5 ${nasm_MD5}
242244
CONFIGURE_COMMAND ./configure --prefix=${WINST_PREFIX}
@@ -255,7 +257,7 @@ ELSE ( FETCH_ONLY )
255257
# Perl - required for OpenSSL
256258
if( WIN32 AND NOT UNIX )
257259
ExternalProject_Add( perl
258-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
260+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
259261
URL ${perl_URL}
260262
URL_MD5 ${perl_MD5}
261263
CONFIGURE_COMMAND ""
@@ -270,7 +272,7 @@ ELSE ( FETCH_ONLY )
270272
)
271273
else( WIN32 AND NOT UNIX )
272274
ExternalProject_Add( perl
273-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
275+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
274276
URL ${perl_URL}
275277
URL_MD5 ${perl_MD5}
276278
CONFIGURE_COMMAND ./Configure -de -Dprefix=${WINST_PREFIX}
@@ -288,7 +290,7 @@ ELSE ( FETCH_ONLY )
288290
endif( WIN32 AND NOT UNIX )
289291

290292
ExternalProject_Add( zlib
291-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
293+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
292294
URL ${zlib_URL}
293295
URL_MD5 ${zlib_MD5}
294296
LIST_SEPARATOR ^^
@@ -304,11 +306,11 @@ ELSE ( FETCH_ONLY )
304306

305307
ExternalProject_Add( bzip2
306308
DEPENDS patch
307-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
309+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
308310
URL ${bzip2_URL}
309311
URL_MD5 ${bzip2_MD5}
310312
LIST_SEPARATOR ^^
311-
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/bzip2.patch
313+
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/bzip2.patch
312314
CMAKE_ARGS -DCMAKE_SYSTEM_IGNORE_PATH=/lib^^/usr/lib^^/usr/local/lib^^/usr/include^^/usr/local/include -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${WINST_PREFIX} -DCMAKE_PREFIX_PATH:PATH=${WINST_PREFIX}
313315
LOG_DOWNLOAD 1
314316
LOG_UPDATE 1
@@ -320,11 +322,11 @@ ELSE ( FETCH_ONLY )
320322

321323
ExternalProject_Add( libpng
322324
DEPENDS zlib
323-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
325+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
324326
URL ${libpng_URL}
325327
URL_MD5 ${libpng_MD5}
326328
# LIST_SEPARATOR ^^
327-
# PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/libpng-export.patch
329+
# PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/libpng-export.patch
328330
CMAKE_ARGS
329331
# -DCMAKE_SYSTEM_IGNORE_PATH=/lib^^/usr/lib^^/usr/local/lib^^/usr/include^^/usr/local/include
330332
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${WINST_PREFIX} -DCMAKE_PREFIX_PATH:PATH=${WINST_PREFIX}
@@ -338,11 +340,11 @@ ELSE ( FETCH_ONLY )
338340

339341
ExternalProject_Add( libjpeg
340342
DEPENDS patch
341-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
343+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
342344
URL ${libjpeg_URL}
343345
URL_MD5 ${libjpeg_MD5}
344346
LIST_SEPARATOR ^^
345-
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/jpeg8.patch
347+
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/jpeg8.patch
346348
CMAKE_ARGS -DCMAKE_SYSTEM_IGNORE_PATH=/lib^^/usr/lib^^/usr/local/lib^^/usr/include^^/usr/local/include -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${WINST_PREFIX} -DCMAKE_PREFIX_PATH:PATH=${WINST_PREFIX}
347349
LOG_DOWNLOAD 1
348350
LOG_UPDATE 1
@@ -354,11 +356,11 @@ ELSE ( FETCH_ONLY )
354356

355357
ExternalProject_Add( freetype
356358
DEPENDS zlib libpng patch
357-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
359+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
358360
URL ${freetype_URL}
359361
URL_MD5 ${freetype_MD5}
360362
LIST_SEPARATOR ^^
361-
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/freetype-2.3.12.patch
363+
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/freetype-2.3.12.patch
362364
CMAKE_ARGS -DCMAKE_SYSTEM_IGNORE_PATH=/lib^^/usr/lib^^/usr/local/lib^^/usr/include^^/usr/local/include -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${WINST_PREFIX} -DCMAKE_PREFIX_PATH:PATH=${WINST_PREFIX}
363365
LOG_DOWNLOAD 1
364366
LOG_UPDATE 1
@@ -427,16 +429,16 @@ ELSE ( FETCH_ONLY )
427429
set( ENV{PATH} "${_NEWPATH}" )
428430
ExternalProject_Add( openssl
429431
DEPENDS zlib perl patch nasm
430-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
432+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
431433
URL ${openssl_URL}
432434
URL_MD5 ${openssl_MD5}
433435
LIST_SEPARATOR ^^
434-
UPDATE_COMMAND ${CMAKE_COMMAND} -DWINST_DIR:PATH=${WINST_PREFIX} -DOPENSSL_SOURCE_DIR:PATH=<SOURCE_DIR> -DOPENSSL_CONFIGURE_COMMAND:STRING=${OPENSSL_CONFIGURE_COMMAND} -P ${PROJECT_SOURCE_DIR}/configure-openssl.cmake
435-
# PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/openssl-1.0.1e.patch
436-
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DWINST_DIR=${WINST_PREFIX} -DOPENSSL_SOURCE_DIR=<SOURCE_DIR> -DOPENSSL_GENASM_COMMAND=${OPENSSL_GENASM_COMMAND} -P ${PROJECT_SOURCE_DIR}/genasm-openssl.cmake
437-
BUILD_COMMAND ${CMAKE_COMMAND} -DWINST_DIR=${WINST_PREFIX} -DOPENSSL_SOURCE_DIR=<SOURCE_DIR> -DOPENSSL_BUILD_COMMAND=${OPENSSL_BUILD_COMMAND} -P ${PROJECT_SOURCE_DIR}/build-openssl.cmake
436+
UPDATE_COMMAND ${CMAKE_COMMAND} -DWINST_DIR:PATH=${WINST_PREFIX} -DOPENSSL_SOURCE_DIR:PATH=<SOURCE_DIR> -DOPENSSL_CONFIGURE_COMMAND:STRING=${OPENSSL_CONFIGURE_COMMAND} -P ${WINST_BASEDIR}/cmake/configure-openssl.cmake
437+
# PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/openssl-1.0.1e.patch
438+
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DWINST_DIR=${WINST_PREFIX} -DOPENSSL_SOURCE_DIR=<SOURCE_DIR> -DOPENSSL_GENASM_COMMAND=${OPENSSL_GENASM_COMMAND} -P ${WINST_BASEDIR}/cmake/genasm-openssl.cmake
439+
BUILD_COMMAND ${CMAKE_COMMAND} -DWINST_DIR=${WINST_PREFIX} -DOPENSSL_SOURCE_DIR=<SOURCE_DIR> -DOPENSSL_BUILD_COMMAND=${OPENSSL_BUILD_COMMAND} -P ${WINST_BASEDIR}/cmake/build-openssl.cmake
438440
BUILD_IN_SOURCE 1
439-
INSTALL_COMMAND ${CMAKE_COMMAND} -DWINST_DIR=${WINST_PREFIX} -DOPENSSL_SOURCE_DIR=<SOURCE_DIR> -DOPENSSL_INSTALL_COMMAND=${OPENSSL_INSTALL_COMMAND} -P ${PROJECT_SOURCE_DIR}/install-openssl.cmake
441+
INSTALL_COMMAND ${CMAKE_COMMAND} -DWINST_DIR=${WINST_PREFIX} -DOPENSSL_SOURCE_DIR=<SOURCE_DIR> -DOPENSSL_INSTALL_COMMAND=${OPENSSL_INSTALL_COMMAND} -P ${WINST_BASEDIR}/cmake/install-openssl.cmake
440442
LOG_DOWNLOAD 1
441443
LOG_UPDATE 1
442444
LOG_CONFIGURE 1
@@ -447,7 +449,7 @@ ELSE ( FETCH_ONLY )
447449

448450
# if( WIN32 AND NOT UNIX )
449451
# ExternalProject_Add( 7zip
450-
# DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
452+
# DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
451453
# URL ${7zip_URL}
452454
# URL_MD5 ${7zip_MD5}
453455
# CONFIGURE_COMMAND ""
@@ -463,7 +465,7 @@ ELSE ( FETCH_ONLY )
463465

464466
# ExternalProject_Add( git
465467
# DEPENDS 7zip
466-
# DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
468+
# DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
467469
# URL ${git_URL}
468470
# URL_MD5 ${git_MD5}
469471
# BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR> ${WINST_PREFIX}/git
@@ -482,7 +484,7 @@ ELSE ( FETCH_ONLY )
482484

483485
if( WIN32 AND NOT UNIX )
484486
ExternalProject_Add( postgresql
485-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
487+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
486488
URL ${postgresql_URL}
487489
URL_MD5 ${postgresql_MD5}
488490
CONFIGURE_COMMAND ""
@@ -498,7 +500,7 @@ ELSE ( FETCH_ONLY )
498500
else( WIN32 AND NOT UNIX )
499501
ExternalProject_Add( postgresql
500502
DEPENDS perl openssl zlib
501-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
503+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
502504
URL ${postgresql_URL}
503505
URL_MD5 ${postgresql_MD5}
504506
CONFIGURE_COMMAND ./configure --prefix=${WINST_PREFIX} --without-readline
@@ -518,10 +520,10 @@ ELSE ( FETCH_ONLY )
518520
if(NOT WIN32)
519521
ExternalProject_Add( fcgi
520522
DEPENDS patch
521-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
523+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
522524
URL ${fcgi_URL}
523525
URL_MD5 ${fcgi_MD5}
524-
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/fcgi-2.4.0-cstdiofix.patch
526+
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/fcgi-2.4.0-cstdiofix.patch
525527
CONFIGURE_COMMAND ./configure --prefix=${WINST_PREFIX}
526528
BUILD_COMMAND ${CMAKE_BUILD_TOOL}
527529
BUILD_IN_SOURCE 1
@@ -541,7 +543,7 @@ ELSE ( FETCH_ONLY )
541543
set( PLATFORM_SPECIFIC_FLAGS -with-shared )
542544
endif(APPLE)
543545
ExternalProject_Add( ncurses
544-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
546+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
545547
URL ${ncurses_URL}
546548
URL_MD5 ${ncurses_MD5}
547549
CONFIGURE_COMMAND ./configure --prefix=${WINST_PREFIX} ${PLATFORM_SPECIFIC_FLAGS} --with-shared --disable-rpath --without-progs --without-debug --without-ada
@@ -560,7 +562,7 @@ ELSE ( FETCH_ONLY )
560562
if( WIN32 )
561563
# Download and extract MySQL binaries. Or build it?
562564
ExternalProject_Add( mysql
563-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
565+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
564566
URL ${mysql_URL}
565567
URL_MD5 ${mysql_MD5}
566568
CONFIGURE_COMMAND ""
@@ -576,7 +578,7 @@ ELSE ( FETCH_ONLY )
576578
else( WIN32 )
577579
ExternalProject_Add( mysql
578580
DEPENDS zlib openssl ncurses
579-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
581+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
580582
URL ${mysql_URL}
581583
URL_MD5 ${mysql_MD5}
582584
LIST_SEPARATOR ^^
@@ -592,10 +594,10 @@ ELSE ( FETCH_ONLY )
592594

593595
ExternalProject_Add( libharu
594596
DEPENDS zlib libpng patch
595-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
597+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
596598
URL ${libharu_URL}
597599
URL_MD5 ${libharu_MD5}
598-
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/libharu-2.3.0RC2.patch
600+
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/libharu-2.3.0RC2.patch
599601
CMAKE_ARGS
600602
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${WINST_PREFIX} -DCMAKE_PREFIX_PATH:PATH=${WINST_PREFIX}
601603
LOG_DOWNLOAD 1
@@ -610,7 +612,7 @@ ELSE ( FETCH_ONLY )
610612
if( UNIX AND NOT WIN32 )
611613
ExternalProject_Add( graphicsmagick
612614
DEPENDS libpng zlib bzip2 libjpeg
613-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
615+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
614616
URL ${graphicsmagick_URL}
615617
URL_MD5 ${graphicsmagick_MD5}
616618
CONFIGURE_COMMAND ./configure --enable-shared --prefix=${WINST_PREFIX}
@@ -627,7 +629,7 @@ ELSE ( FETCH_ONLY )
627629
else( UNIX AND NOT WIN32 )
628630
ExternalProject_Add( graphicsmagick
629631
DOWNLOAD_NAME graphicsmagick.exe
630-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
632+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
631633
URL ${graphicsmagick_URL}
632634
URL_MD5 ${graphicsmagick_MD5}
633635
CONFIGURE_COMMAND ""
@@ -654,7 +656,7 @@ ELSE ( FETCH_ONLY )
654656
set( boost_COMMAND ${boost_BJAM} --prefix=${WINST_PREFIX} --build-type=minimal --variant=release --without-python ${boost_LINKAGE} threading=multi include=${WINST_PREFIX}/include linkflags=-L${WINST_PREFIX}/lib )
655657
ExternalProject_Add( boost
656658
DEPENDS zlib bzip2
657-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
659+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
658660
URL ${boost_URL}
659661
URL_MD5 ${boost_MD5}
660662
CONFIGURE_COMMAND ${boost_BOOTSTRAP_COMMAND}
@@ -679,9 +681,9 @@ ELSE ( FETCH_ONLY )
679681
ExternalProject_Add( wtgit
680682
DEPENDS zlib libpng libharu openssl boost ${WT_UNIXONLY_DEPENDENCIES}
681683
# git
682-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
684+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
683685
GIT_REPOSITORY http://www.webtoolkit.eu/git/wt.git
684-
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/wt-3.3.0.patch
686+
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/wt-3.3.0.patch
685687
CMAKE_ARGS ${wt_CMAKE_ARGS}
686688
LOG_DOWNLOAD 1
687689
LOG_UPDATE 1
@@ -693,10 +695,10 @@ ELSE ( FETCH_ONLY )
693695
else( WTGIT )
694696
ExternalProject_Add( wt
695697
DEPENDS zlib libpng libharu openssl boost ${WT_UNIXONLY_DEPENDENCIES}
696-
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads
698+
DOWNLOAD_DIR ${WINST_BASEDIR}/downloads
697699
URL ${wt_URL}
698700
URL_MD5 ${wt_MD5}
699-
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/wt-3.3.0.patch
701+
PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${WINST_BASEDIR}/patches/wt-3.3.0.patch
700702
CMAKE_ARGS ${wt_CMAKE_ARGS}
701703
LOG_DOWNLOAD 1
702704
LOG_UPDATE 1

mysql++-3.1.0.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)