Skip to content

Commit

Permalink
Merge pull request #9 from RyeMutt/main
Browse files Browse the repository at this point in the history 
Fix windows symbol generation and remove unused openssl dependency
  • Loading branch information
@bennettgoble
bennettgoble authored Aug 11, 2024
2 parents c4d1687 + cb4588a commit 945d742
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 90 deletions.
88 changes: 7 additions & 81 deletions autobuild.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>bd61ec7787ea96d11f735afa5a6296ed175472b6</string>
<string>8cc4f38fd809d9ff5d8ca617d7e068eb236f4162</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r4/expat-2.6.2-r4-darwin64-10278332617.tar.zst</string>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r5/expat-2.6.2-r5-darwin64-10337781902.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -54,11 +54,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>acf891bda4125a92f6347e69f0e7867f32cebd20</string>
<string>d7f3bbfd65fce365c3cd5be9ab72072580408dec</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r4/expat-2.6.2-r4-linux64-10278332617.tar.zst</string>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r5/expat-2.6.2-r5-linux64-10337781902.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -82,11 +82,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>1b9c198626fca0f30fb2770856e65767a9951683</string>
<string>f11d91205bb753d7389a73e629627b200219c62f</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r4/expat-2.6.2-r4-windows64-10278332617.tar.zst</string>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r5/expat-2.6.2-r5-windows64-10337781902.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand All @@ -99,86 +99,12 @@
<key>copyright</key>
<string>Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001-2022 Expat maintainers.</string>
<key>version</key>
<string>2.6.2-r4</string>
<string>2.6.2-r5</string>
<key>name</key>
<string>expat</string>
<key>description</key>
<string>Expat is an XML parser library written in C</string>
</map>
<key>openssl</key>
<map>
<key>platforms</key>
<map>
<key>darwin64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>b286e4a10cf6b1b2710b85ff96ffc0e41fd5fde8</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-openssl/releases/download/v1.1.1q.de53f55/openssl-1.1.1q.de53f55-darwin64-de53f55.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
</map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>5f6953db991ef6badb0525ecc98daf28d368e9e7</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-openssl/releases/download/v1.1.1q.de53f55/openssl-1.1.1q.de53f55-linux64-de53f55.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>dbf2f69a7d73821dbe12288097298924e866e606</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-openssl/releases/download/v1.1.1q.de53f55/openssl-1.1.1q.de53f55-windows-de53f55.tar.zst</string>
</map>
<key>name</key>
<string>windows</string>
</map>
<key>windows64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>8bd3dea6d81de5e469b241a1b79e61efce6ecc05</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-openssl/releases/download/v1.1.1q.de53f55/openssl-1.1.1q.de53f55-windows64-de53f55.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>openssl</string>
<key>license_file</key>
<string>LICENSES/openssl.txt</string>
<key>copyright</key>
<string>Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved; Copyright (C) 1995-1998 Eric Young ([email protected])</string>
<key>version</key>
<string>1.1.1q.de53f55</string>
<key>name</key>
<string>openssl</string>
<key>description</key>
<string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
</map>
</map>
<key>package_description</key>
<map>
Expand Down
20 changes: 11 additions & 9 deletions build-cmd.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ PKG_LIB="$STAGING_DIR/packages/lib"
PKG_INCLUDE="$STAGING_DIR/packages/include"
EXPAT_LIBRARIES="$PKG_LIB/release"
EXPAT_INCLUDE_DIRS="$PKG_INCLUDE/expat"
OPENSSL_LIBRARIES="$PKG_LIB/release"
OPENSSL_INCLUDE_DIRS="$PKG_INCLUDE/openssl"

# remove_cxxstd
source "$(dirname "$AUTOBUILD_VARIABLES_FILE")/functions"
Expand Down Expand Up @@ -58,16 +56,19 @@ case "$AUTOBUILD_PLATFORM" in

load_vsvars

opts="$(replace_switch /Zi /Z7 $LL_BUILD_RELEASE)"
plainopts="$(remove_switch /GR $(remove_cxxstd $opts))"

# have to use different CMake directories for APR build vs. APR-UTIL build
# --------------------------------- apr ----------------------------------
APR_BUILD_DIR="$STAGING_DIR/apr-build$AUTOBUILD_ADDRSIZE"
APR_RELEASE_DIR="$APR_BUILD_DIR/Release"
mkdir -p "$APR_BUILD_DIR"
pushd "$APR_BUILD_DIR"
logfile="CMakeFiles/CMakeOutput.log"
if ! cmake -G "Ninja Multi-Config" \
if ! cmake -G "Ninja Multi-Config" -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX="$(cygpath -m "$TOP_DIR/apr")" \
-DCMAKE_C_FLAGS="$LL_BUILD_RELEASE" \
-DCMAKE_C_FLAGS="$plainopts" \
-DCMAKE_SHARED_LINKER_FLAGS="/DEBUG:FULL" \
-DAPR_HAVE_IPV6=OFF \
"$(cygpath -m "$TOP_DIR/apr")"
Expand All @@ -90,13 +91,12 @@ case "$AUTOBUILD_PLATFORM" in
APR_UTIL_RELEASE_DIR="$APR_UTIL_BUILD_DIR/Release"
mkdir -p "$APR_UTIL_BUILD_DIR"
cd "$APR_UTIL_BUILD_DIR"
if ! cmake -G "Ninja Multi-Config" \
if ! cmake -G "Ninja Multi-Config" -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX="$(cygpath -m "$TOP_DIR/apr")" \
-DAPR_LIBRARIES:FILEPATH="$(cygpath -m "$APR_RELEASE_DIR/libapr-1.lib")" \
-DEXPAT_INCLUDE_DIR="$(cygpath -m "$EXPAT_INCLUDE_DIRS")" \
-DEXPAT_LIBRARY="$(cygpath -m "$EXPAT_LIBRARIES/libexpat.lib")" \
-DOPENSSL_ROOT_DIR:PATH="$(cygpath -m "$OPENSSL_LIBRARIES")" \
-DCMAKE_C_FLAGS="$LL_BUILD_RELEASE" \
-DCMAKE_C_FLAGS="$plainopts" \
-DCMAKE_SHARED_LINKER_FLAGS="/DEBUG:FULL" \
"$(cygpath -m "$TOP_DIR/apr-util")"
then
Expand All @@ -115,8 +115,10 @@ case "$AUTOBUILD_PLATFORM" in

mkdir -p "$RELEASE_OUT_DIR" || echo "$RELEASE_OUT_DIR exists"

cp -v "$APR_RELEASE_DIR"/{apr-1.lib,libapr-1.{pdb,lib,dll}} "$RELEASE_OUT_DIR"
cp -v "$APR_UTIL_RELEASE_DIR"/{aprutil-1.lib,libaprutil-1.{pdb,lib,dll}} "$RELEASE_OUT_DIR"
cp -v "$APR_RELEASE_DIR/apr-1.lib" "$RELEASE_OUT_DIR"
cp -v "$APR_UTIL_RELEASE_DIR/aprutil-1.lib" "$RELEASE_OUT_DIR"
# cp -v "$APR_RELEASE_DIR"/{apr-1.lib,libapr-1.{pdb,lib,dll}} "$RELEASE_OUT_DIR"
# cp -v "$APR_UTIL_RELEASE_DIR"/{aprutil-1.lib,libaprutil-1.{pdb,lib,dll}} "$RELEASE_OUT_DIR"
## cp "apr-iconv$bitdir/LibR"/apriconv-1.{lib,pdb} "$RELEASE_OUT_DIR"
## cp "apr-iconv$bitdir/Release/libapriconv-1."{lib,dll} "$RELEASE_OUT_DIR"

Expand Down

0 comments on commit 945d742

Please sign in to comment.