Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fff85155
Commit
fff85155
authored
Mar 28, 2011
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
3ebe4e4c
ab7ada17
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
33 deletions
+30
-33
extra/CMakeLists.txt
extra/CMakeLists.txt
+16
-10
win/cmake/install_macros.cmake
win/cmake/install_macros.cmake
+12
-23
win/packaging/mysql_server.wxs.in
win/packaging/mysql_server.wxs.in
+2
-0
No files found.
extra/CMakeLists.txt
View file @
fff85155
...
@@ -22,19 +22,25 @@ TARGET_LINK_LIBRARIES(comp_err debug dbug mysys strings zlib wsock32)
...
@@ -22,19 +22,25 @@ TARGET_LINK_LIBRARIES(comp_err debug dbug mysys strings zlib wsock32)
GET_TARGET_PROPERTY
(
COMP_ERR_EXE comp_err LOCATION
)
GET_TARGET_PROPERTY
(
COMP_ERR_EXE comp_err LOCATION
)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
CMAKE_BINARY_DIR
}
/include/mysqld_error.h
# Generate mysqld_error.h
# Try not to change its timestamp if not necessary(as touching
# mysqld_error.h results in rebuild of the almost whole server)
# To preserve timestamp, first generate a temp header file, then copy it
# to mysqld_error.h using cmake -E copy_if_different
ADD_CUSTOM_COMMAND
(
OUTPUT
${
CMAKE_BINARY_DIR
}
/include/mysqld_error.h.tmp
COMMAND
${
COMP_ERR_EXE
}
COMMAND
${
COMP_ERR_EXE
}
--charset=
${
PROJECT_SOURCE_DIR
}
/sql/share/charsets
--charset=
${
PROJECT_SOURCE_DIR
}
/sql/share/charsets
--out-dir=
${
CMAKE_BINARY_DIR
}
/sql/share/
--out-dir=
${
CMAKE_BINARY_DIR
}
/sql/share/
--header_file=
${
CMAKE_BINARY_DIR
}
/include/mysqld_error.h
--header_file=
${
CMAKE_BINARY_DIR
}
/include/mysqld_error.h.tmp
--name_file=
${
CMAKE_BINARY_DIR
}
/include/mysqld_ername.h
--name_file=
${
CMAKE_BINARY_DIR
}
/include/mysqld_ername.h
--state_file=
${
CMAKE_BINARY_DIR
}
/include/sql_state.h
--state_file=
${
CMAKE_BINARY_DIR
}
/include/sql_state.h
--in_file=
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
--in_file=
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
${
CMAKE_BINARY_DIR
}
/include/mysqld_error.h.tmp
${
CMAKE_BINARY_DIR
}
/include/mysqld_error.h
DEPENDS comp_err
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
)
DEPENDS comp_err
${
PROJECT_SOURCE_DIR
}
/sql/share/errmsg.txt
)
ADD_CUSTOM_TARGET
(
GenError
ADD_CUSTOM_TARGET
(
GenError
ALL
ALL
DEPENDS
${
CMAKE_BINARY_DIR
}
/include/mysqld_error.h
)
DEPENDS
${
CMAKE_BINARY_DIR
}
/include/mysqld_error.h
.tmp
)
ADD_EXECUTABLE
(
my_print_defaults my_print_defaults.c
)
ADD_EXECUTABLE
(
my_print_defaults my_print_defaults.c
)
TARGET_LINK_LIBRARIES
(
my_print_defaults strings mysys debug dbug taocrypt wsock32
)
TARGET_LINK_LIBRARIES
(
my_print_defaults strings mysys debug dbug taocrypt wsock32
)
...
...
win/cmake/install_macros.cmake
View file @
fff85155
...
@@ -151,29 +151,13 @@ IF(WIN32)
...
@@ -151,29 +151,13 @@ IF(WIN32)
SET
(
SIGNTOOL_PARAMETERS
SET
(
SIGNTOOL_PARAMETERS
/a /t http://timestamp.verisign.com/scripts/timstamp.dll
/a /t http://timestamp.verisign.com/scripts/timstamp.dll
CACHE STRING
"parameters for signtool (list)"
)
CACHE STRING
"parameters for signtool (list)"
)
FIND_PROGRAM
(
SIGNTOOL_EXECUTABLE signtool
)
FIND_PROGRAM
(
SIGNTOOL_EXECUTABLE signtool
PATHS
"$ENV{ProgramFiles}/Microsoft SDKs/Windows/v7.0A"
)
IF
(
NOT SIGNTOOL_EXECUTABLE
)
IF
(
NOT SIGNTOOL_EXECUTABLE
)
MESSAGE
(
FATAL_ERROR
MESSAGE
(
FATAL_ERROR
"signtool is not found. Signing executables not possible"
)
"signtool is not found. Signing executables not possible"
)
ENDIF
()
ENDIF
()
IF
(
NOT DEFINED SIGNCODE_ENABLED
)
FILE
(
WRITE
${
CMAKE_CURRENT_BINARY_DIR
}
/testsign.c
"int main(){return 0;}"
)
MAKE_DIRECTORY
(
${
CMAKE_CURRENT_BINARY_DIR
}
/testsign
)
TRY_COMPILE
(
RESULT
${
CMAKE_CURRENT_BINARY_DIR
}
/testsign
${
CMAKE_CURRENT_BINARY_DIR
}
/testsign.c
COPY_FILE
${
CMAKE_CURRENT_BINARY_DIR
}
/testsign.exe
)
EXECUTE_PROCESS
(
COMMAND
${
SIGNTOOL_EXECUTABLE
}
sign
${
SIGNTOOL_PARAMETERS
}
${
CMAKE_CURRENT_BINARY_DIR
}
/testsign.exe
RESULT_VARIABLE ERR ERROR_QUIET OUTPUT_QUIET
)
IF
(
ERR EQUAL 0
)
SET
(
SIGNCODE_ENABLED 1 CACHE INTERNAL
"Can sign executables"
)
ELSE
()
MESSAGE
(
STATUS
"Disable authenticode signing for executables"
)
SET
(
SIGNCODE_ENABLED 0 CACHE INTERNAL
"Invalid or missing certificate"
)
ENDIF
()
ENDIF
()
MARK_AS_ADVANCED
(
SIGNTOOL_EXECUTABLE SIGNTOOL_PARAMETERS
)
MARK_AS_ADVANCED
(
SIGNTOOL_EXECUTABLE SIGNTOOL_PARAMETERS
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
...
@@ -195,10 +179,15 @@ MACRO(SIGN_TARGET)
...
@@ -195,10 +179,15 @@ MACRO(SIGN_TARGET)
ENDIF
()
ENDIF
()
INSTALL
(
CODE
INSTALL
(
CODE
"EXECUTE_PROCESS(COMMAND
"EXECUTE_PROCESS(COMMAND
\"
${
SIGNTOOL_EXECUTABLE
}
\"
verify /pa /q
\"
${
target_location
}
\"
RESULT_VARIABLE ERR)
IF(NOT
\$
{ERR} EQUAL 0)
EXECUTE_PROCESS(COMMAND
\"
${
SIGNTOOL_EXECUTABLE
}
\"
sign
${
SIGNTOOL_PARAMETERS
}
\"
${
target_location
}
\"
\"
${
SIGNTOOL_EXECUTABLE
}
\"
sign
${
SIGNTOOL_PARAMETERS
}
\"
${
target_location
}
\"
RESULT_VARIABLE ERR)
RESULT_VARIABLE ERR)
ENDIF()
IF(NOT
\$
{ERR} EQUAL 0)
IF(NOT
\$
{ERR} EQUAL 0)
MESSAGE(FATAL_ERROR
\"
Error signing
${
target_location
}
\"
)
MESSAGE(FATAL_ERROR
\"
Error signing '
${
target_location
}
'
\"
)
ENDIF()
ENDIF()
"
${
comp
}
)
"
${
comp
}
)
ENDIF
()
ENDIF
()
...
@@ -229,7 +218,7 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
...
@@ -229,7 +218,7 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
FOREACH
(
target
${
TARGETS
}
)
FOREACH
(
target
${
TARGETS
}
)
# If signing is required, sign executables before installing
# If signing is required, sign executables before installing
IF
(
SIGNCODE
AND SIGNCODE_ENABLED
)
IF
(
SIGNCODE
)
SIGN_TARGET
(
${
target
}
${
COMP
}
)
SIGN_TARGET
(
${
target
}
${
COMP
}
)
ENDIF
()
ENDIF
()
# Install man pages on Unix
# Install man pages on Unix
...
...
win/packaging/mysql_server.wxs.in
View file @
fff85155
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
<!-- Upgrade -->
<!-- Upgrade -->
<Upgrade Id="@CPACK_WIX_UPGRADE_CODE@">
<Upgrade Id="@CPACK_WIX_UPGRADE_CODE@">
<?if "@PATCH_VERSION@" != "0"?>
<UpgradeVersion
<UpgradeVersion
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
IncludeMinimum="yes"
IncludeMinimum="yes"
...
@@ -29,6 +30,7 @@
...
@@ -29,6 +30,7 @@
Property="OLDERVERSIONBEINGUPGRADED"
Property="OLDERVERSIONBEINGUPGRADED"
MigrateFeatures="yes"
MigrateFeatures="yes"
/>
/>
<?endif?>
<UpgradeVersion
<UpgradeVersion
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.999"
Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.999"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment