From a70bb6564fc2b22837f00ab393be485ea4352089 Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Fri, 5 Apr 2024 16:05:30 -0700 Subject: [PATCH 1/5] Bump expat to 2.6.2 --- .github/workflows/build.yaml | 14 +++--- BuildParams | 7 --- autobuild.xml | 84 ++++++++++++++++++------------------ build-cmd.sh | 4 +- 4 files changed, 50 insertions(+), 59 deletions(-) delete mode 100644 BuildParams diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f2aa1a3..a8cb0ac 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,24 +1,20 @@ name: Build -on: [push] +on: + pull_request: + push: + branches: [main] + tags: [v*] jobs: build: strategy: matrix: os: [windows-2022, macos-11, ubuntu-22.04] - addrsize: ["64"] - include: - - os: windows-2022 - addrsize: "32" runs-on: ${{ matrix.os }} steps: - uses: secondlife/action-autobuild@v3 - with: - addrsize: ${{ matrix.addrsize }} release: needs: build runs-on: [ubuntu-latest] if: startsWith(github.ref, 'refs/tags/v') steps: - uses: secondlife/action-autobuild-release@v3 - with: - public: true diff --git a/BuildParams b/BuildParams deleted file mode 100644 index 35fe6c0..0000000 --- a/BuildParams +++ /dev/null @@ -1,7 +0,0 @@ -# Use Public Upload Locations -public_build = true - - -# Need viewer-build-variables as well as other shared repositories -# build_variables_repository_url set in TC project hierarchy -buildscripts_shared_more_NAMEs="build_variables" diff --git a/autobuild.xml b/autobuild.xml index fb5837e..3a0b517 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1,19 +1,14 @@ - + + + version + 1.3 + type + autobuild installables expat - copyright - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. - description - Expat is an XML parser library written in C - license - expat - license_file - LICENSES/expat.txt - name - expat platforms darwin @@ -33,11 +28,11 @@ archive hash - b85526ca80b6a7e73c7870285cf68d568f742095 + 953b8119c28e81b327197d1de3d44a78c6cd30dc hash_algorithm sha1 url - https://github.com/secondlife/3p-expat/releases/download/v2.1.1.1f36d02/expat-2.1.1.1f36d02-darwin64-1f36d02.tar.zst + https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r2/expat-2.6.2-r2-darwin64-8518267865.tar.zst name darwin64 @@ -59,11 +54,11 @@ archive hash - 4cd82e2dec06ddff19e9b3dc0254f2593ec80452 + b1f58b1f340a3bab726ad017fcf8515ffea4c3de hash_algorithm sha1 url - https://github.com/secondlife/3p-expat/releases/download/v2.1.1.1f36d02/expat-2.1.1.1f36d02-linux64-1f36d02.tar.zst + https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r2/expat-2.6.2-r2-linux64-8518267865.tar.zst name linux64 @@ -87,34 +82,32 @@ archive hash - 47c01a89bc32c5740efe51be43e459ffd9b7cd34 + 6e7a67b5ea6cf826862c9f0a5988a3ad8791a759 hash_algorithm sha1 url - https://github.com/secondlife/3p-expat/releases/download/v2.1.1.1f36d02/expat-2.1.1.1f36d02-windows64-1f36d02.tar.zst + https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r2/expat-2.6.2-r2-windows64-8518267865.tar.zst name windows64 + license + expat + license_file + LICENSES/expat.txt + copyright + Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. version - 2.1.1.1f36d02 + 2.6.2-r2 + name + expat + description + Expat is an XML parser library written in C package_description - canonical_repo - https://github.com/secondlife/3p-xmlrpc-epi - copyright - Copyright: (C) 2000 Epinions, Inc. - description - XMLRPC Library - license - xmlrpc-epi - license_file - LICENSES/xmlrpc-epi.txt - name - xmlrpc-epi platforms common @@ -147,8 +140,6 @@ darwin - build_directory - stage configurations default @@ -166,13 +157,13 @@ lib/release/*.a + build_directory + stage name darwin linux - build_directory - stage configurations default @@ -190,13 +181,13 @@ lib/release/*.a + build_directory + stage name linux windows - build_directory - stage configurations default @@ -214,15 +205,26 @@ lib/release/*.lib + build_directory + stage name windows + license + xmlrpc-epi + license_file + LICENSES/xmlrpc-epi.txt + copyright + Copyright: (C) 2000 Epinions, Inc. version_file VERSION.txt + name + xmlrpc-epi + canonical_repo + https://github.com/secondlife/3p-xmlrpc-epi + description + XMLRPC Library - type - autobuild - version - 1.3 - + + diff --git a/build-cmd.sh b/build-cmd.sh index 16953fe..9ad57db 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -76,7 +76,7 @@ pushd "$XMLRPCEPI_SOURCE_DIR" CFLAGS="$plainopts" CXXFLAGS="$opts" LDFLAGS="$plainopts" \ ./configure --prefix="$stage" \ --with-expat=no \ - --with-expat-lib="$stage/packages/lib/release/libexpat.dylib" \ + --with-expat-lib="$stage/packages/lib/release/libexpat.a" \ --with-expat-inc="$stage/packages/include/expat" make -j$(nproc) make install @@ -96,7 +96,7 @@ pushd "$XMLRPCEPI_SOURCE_DIR" plainopts="$(remove_cxxstd $opts)" CFLAGS="$plainopts" CXXFLAGS="$opts" ./configure --prefix="$stage" \ --with-expat=no \ - --with-expat-lib="$stage/packages/lib/release/libexpat.so" \ + --with-expat-lib="$stage/packages/lib/release/libexpat.a" \ --with-expat-inc="$stage/packages/include/expat" make -j$(nproc) make install From 9bd22c4a1464c58885458e1fb6748b1313066543 Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Sat, 6 Apr 2024 11:12:16 -0700 Subject: [PATCH 2/5] Force macOS compiler to AppleClang --- .gitignore | 13 +++++++++++-- build-cmd.sh | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f1dbb0a..f9dc95d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,12 @@ -syntax: glob -stage/ +*.cache/ +*.la +*.lo +*.log +*.o +*.status +.deps/ +.libs/ +Makefile autobuild-parabuild-bootstrap/ +xmlrpc-epi/libtool +stage/ diff --git a/build-cmd.sh b/build-cmd.sh index 9ad57db..26c5ff9 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -73,7 +73,7 @@ pushd "$XMLRPCEPI_SOURCE_DIR" darwin*) opts="-arch $AUTOBUILD_CONFIGURE_ARCH $LL_BUILD_RELEASE" plainopts="$(remove_cxxstd $opts)" - CFLAGS="$plainopts" CXXFLAGS="$opts" LDFLAGS="$plainopts" \ + CFLAGS="$plainopts" CXXFLAGS="$opts" LDFLAGS="$plainopts" CC="clang" \ ./configure --prefix="$stage" \ --with-expat=no \ --with-expat-lib="$stage/packages/lib/release/libexpat.a" \ From 01067ad142c6dc4da11b12f001d7468bc46cfe5c Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Sat, 6 Apr 2024 14:45:48 -0700 Subject: [PATCH 3/5] Pull in macOS expat build with correct toolchain --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 3a0b517..5266056 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -28,11 +28,11 @@ archive hash - 953b8119c28e81b327197d1de3d44a78c6cd30dc + 45393addcda09b1146abfdd42af8d4e4f6e4671b hash_algorithm sha1 url - https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r2/expat-2.6.2-r2-darwin64-8518267865.tar.zst + https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r3/expat-2.6.2-r3-darwin64-8583963182.tar.zst name darwin64 @@ -54,11 +54,11 @@ archive hash - b1f58b1f340a3bab726ad017fcf8515ffea4c3de + 0cafca1370b272e7aa717f239c90750b0c19e307 hash_algorithm sha1 url - https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r2/expat-2.6.2-r2-linux64-8518267865.tar.zst + https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r3/expat-2.6.2-r3-linux64-8583963182.tar.zst name linux64 @@ -82,11 +82,11 @@ archive hash - 6e7a67b5ea6cf826862c9f0a5988a3ad8791a759 + 3bbe911f3658a42f17030e70388455c18108d709 hash_algorithm sha1 url - https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r2/expat-2.6.2-r2-windows64-8518267865.tar.zst + https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r3/expat-2.6.2-r3-windows64-8583963182.tar.zst name windows64 @@ -99,7 +99,7 @@ copyright Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. version - 2.6.2-r2 + 2.6.2-r3 name expat description From 2ecc1ce2f19d4412fb4f09d5212f9febce7cde5a Mon Sep 17 00:00:00 2001 From: Signal Linden Date: Sat, 6 Apr 2024 15:22:23 -0700 Subject: [PATCH 4/5] macOS: CXX=clang++ --- build-cmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-cmd.sh b/build-cmd.sh index 26c5ff9..8c1e1af 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -73,7 +73,7 @@ pushd "$XMLRPCEPI_SOURCE_DIR" darwin*) opts="-arch $AUTOBUILD_CONFIGURE_ARCH $LL_BUILD_RELEASE" plainopts="$(remove_cxxstd $opts)" - CFLAGS="$plainopts" CXXFLAGS="$opts" LDFLAGS="$plainopts" CC="clang" \ + CFLAGS="$plainopts" CXXFLAGS="$opts" LDFLAGS="$plainopts" CC="clang" CXX="clang++" \ ./configure --prefix="$stage" \ --with-expat=no \ --with-expat-lib="$stage/packages/lib/release/libexpat.a" \ From 88dfff13d441974fa613bf9e32f72199dc52232c Mon Sep 17 00:00:00 2001 From: Signal Linden Date: Tue, 16 Jul 2024 09:14:34 -0700 Subject: [PATCH 5/5] Update to macos-12 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 580ad04..d1833f4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,7 +8,7 @@ jobs: build: strategy: matrix: - os: [windows-2022, macos-11, ubuntu-22.04] + os: [windows-2022, macos-12, ubuntu-22.04] runs-on: ${{ matrix.os }} steps: - uses: secondlife/action-autobuild@v4