Commit 52310392 authored by Ajay Patel's avatar Ajay Patel

Add raw includes directory (for fileio), link user32 and other windows libs on...

Add raw includes directory (for fileio), link user32 and other windows libs on fileio, and statically link libgcc on Travis
parent 40957f9a
Pipeline #36799846 failed with stages
in 23 minutes and 36 seconds
......@@ -23,7 +23,7 @@ matrix:
script:
- /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
- brew install [email protected] --without-multilib
- export CI_CC="/usr/local/Cellar/gcc/8.2.0/bin/gcc-8"
- export CI_CC="/usr/local/Cellar/gcc/8.2.0/bin/gcc-8 -static-libgcc"
- $PIP install pip setuptools -U
- $PIP install cibuildwheel==0.10.0
- eval "buildwheel() { cibuildwheel --output-dir wheelhouse >>buildwheel.log 2>&1; }"
......
......@@ -109,7 +109,7 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
APSW_TP = THIRD_PARTY + '/_apsw'
SQLITE3 = THIRD_PARTY + '/sqlite3'
ICU = os.path.relpath(SQLITE3 + '/icu', PROJ_PATH)
includes = [os.path.relpath(SQLITE3, PROJ_PATH)]
includes = [os.path.relpath(SQLITE3, PROJ_PATH), os.path.relpath(os.path.join(SQLITE3, 'raw'), PROJ_PATH)]
libraries = [os.path.relpath(SQLITE3, PROJ_PATH)]
compile_args = ["-O4", "-std=c++11"]
link_args = ["-flto"]
......@@ -483,6 +483,10 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
windirent_sources = [SQLITE_POST] + icu_source
windirent_sources = (
windirent_sources if os.path.basename(source) in windirent else [])
libs = ([
"user32",
"Advapi32",
"Kernel32"] if os.path.basename(source) in windirent else [])
miscs.append(
Extension(
SO_PREFIX +
......@@ -493,6 +497,7 @@ def get_modules(THIRD_PARTY, INTERNAL, PROJ_PATH,
[pyinit_source],
include_dirs=includes,
library_dirs=libraries,
libraries=libs,
extra_compile_args=["-O4"],
extra_link_args=link_args))
return miscs
......
......@@ -6,7 +6,7 @@ There are a few components that need updating when updating the version of `sqli
3. **Update SQLite3:** Download the latest SQLite Amalgamation package from the [SQLite website](https://www.sqlite.org/download.html). Update `third_party/sqlite3/sqlite3.c.pre.c` (with `sqlite3.c`) and update `third_party/sqlite3/sqlite3.h`, `third_party/sqlite3/sqlite3_ext.h`, and `third_party/sqlite3/shell.c` from the SQLite Amalgamation package.
3. **Update SQLite3 Extensions:** Download the latest SQLite source code package from the [SQLite website](https://www.sqlite.org/download.html). Update the `third_party/sqlite3/ext` with the `ext` folder from the SQLite source code package. Also copy all of the files from the `src` folder to `third_party/sqlite3/`. Also copy `opcodes.c` and `opcodes.h` to `third_party/sqlite3/`.
3. **Update SQLite3 Extensions:** Download the latest SQLite source code package from the [SQLite website](https://www.sqlite.org/download.html). Update the `third_party/sqlite3/ext` with the `ext` folder from the SQLite source code package. Also copy all of the files from the `src` folder to `third_party/sqlite3/raw`. Also copy `opcodes.c` and `opcodes.h` to `third_party/sqlite3/raw`.
4. **Copy `shell.c`:** Copy `shell.c` from the root of `third_party/_apsw` (which was updated in step #1) to `third_party/sqlite3/apsw_shell.c`.
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment