Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump expat to 2.6.2 #4

Closed
wants to merge 6 commits into from
Closed

Bump expat to 2.6.2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a70bb65
Bump expat to 2.6.2
bennettgoble Apr 5, 2024
9bd22c4
Force macOS compiler to AppleClang
bennettgoble Apr 6, 2024
01067ad
Pull in macOS expat build with correct toolchain
bennettgoble Apr 6, 2024
2ecc1ce
macOS: CXX=clang++
bennettgoble Apr 6, 2024
7862e22
Merge branch 'master' into signal/expat-2.6.2
bennettgoble Jul 16, 2024
88dfff1
Update to macos-12
bennettgoble Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
os: [windows-2022, macos-12, ubuntu-22.04]
runs-on: ${{ matrix.os }}
steps:
- uses: secondlife/action-autobuild@v4
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
13 changes: 11 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
syntax: glob
stage/
*.cache/
*.la
*.lo
*.log
*.o
*.status
.deps/
.libs/
Makefile
autobuild-parabuild-bootstrap/
xmlrpc-epi/libtool
stage/
7 changes: 0 additions & 7 deletions BuildParams
View file
Open in desktop

This file was deleted.

84 changes: 43 additions & 41 deletions autobuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
<?xml version="1.0" ?>
<llsd><map>
<llsd>
<map>
<key>version</key>
<string>1.3</string>
<key>type</key>
<string>autobuild</string>
<key>installables</key>
<map>
<key>expat</key>
<map>
<key>copyright</key>
<string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
<key>description</key>
<string>Expat is an XML parser library written in C</string>
<key>license</key>
<string>expat</string>
<key>license_file</key>
<string>LICENSES/expat.txt</string>
<key>name</key>
<string>expat</string>
<key>platforms</key>
<map>
<key>darwin</key>
Expand All @@ -33,11 +28,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b85526ca80b6a7e73c7870285cf68d568f742095</string>
<string>45393addcda09b1146abfdd42af8d4e4f6e4671b</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.1.1.1f36d02/expat-2.1.1.1f36d02-darwin64-1f36d02.tar.zst</string>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r3/expat-2.6.2-r3-darwin64-8583963182.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -59,11 +54,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4cd82e2dec06ddff19e9b3dc0254f2593ec80452</string>
<string>0cafca1370b272e7aa717f239c90750b0c19e307</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.1.1.1f36d02/expat-2.1.1.1f36d02-linux64-1f36d02.tar.zst</string>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r3/expat-2.6.2-r3-linux64-8583963182.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -87,34 +82,32 @@
<key>archive</key>
<map>
<key>hash</key>
<string>47c01a89bc32c5740efe51be43e459ffd9b7cd34</string>
<string>3bbe911f3658a42f17030e70388455c18108d709</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.1.1.1f36d02/expat-2.1.1.1f36d02-windows64-1f36d02.tar.zst</string>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r3/expat-2.6.2-r3-windows64-8583963182.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>expat</string>
<key>license_file</key>
<string>LICENSES/expat.txt</string>
<key>copyright</key>
<string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
<key>version</key>
<string>2.1.1.1f36d02</string>
<string>2.6.2-r3</string>
<key>name</key>
<string>expat</string>
<key>description</key>
<string>Expat is an XML parser library written in C</string>
</map>
</map>
<key>package_description</key>
<map>
<key>canonical_repo</key>
<string>https://github.com/secondlife/3p-xmlrpc-epi</string>
<key>copyright</key>
<string>Copyright: (C) 2000 Epinions, Inc.</string>
<key>description</key>
<string>XMLRPC Library</string>
<key>license</key>
<string>xmlrpc-epi</string>
<key>license_file</key>
<string>LICENSES/xmlrpc-epi.txt</string>
<key>name</key>
<string>xmlrpc-epi</string>
<key>platforms</key>
<map>
<key>common</key>
Expand Down Expand Up @@ -147,8 +140,6 @@
</map>
<key>darwin</key>
<map>
<key>build_directory</key>
<string>stage</string>
<key>configurations</key>
<map>
<key>default</key>
Expand All @@ -166,13 +157,13 @@
<array>
<string>lib/release/*.a</string>
</array>
<key>build_directory</key>
<string>stage</string>
<key>name</key>
<string>darwin</string>
</map>
<key>linux</key>
<map>
<key>build_directory</key>
<string>stage</string>
<key>configurations</key>
<map>
<key>default</key>
Expand All @@ -190,13 +181,13 @@
<array>
<string>lib/release/*.a</string>
</array>
<key>build_directory</key>
<string>stage</string>
<key>name</key>
<string>linux</string>
</map>
<key>windows</key>
<map>
<key>build_directory</key>
<string>stage</string>
<key>configurations</key>
<map>
<key>default</key>
Expand All @@ -214,15 +205,26 @@
<array>
<string>lib/release/*.lib</string>
</array>
<key>build_directory</key>
<string>stage</string>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>license</key>
<string>xmlrpc-epi</string>
<key>license_file</key>
<string>LICENSES/xmlrpc-epi.txt</string>
<key>copyright</key>
<string>Copyright: (C) 2000 Epinions, Inc.</string>
<key>version_file</key>
<string>VERSION.txt</string>
<key>name</key>
<string>xmlrpc-epi</string>
<key>canonical_repo</key>
<string>https://github.com/secondlife/3p-xmlrpc-epi</string>
<key>description</key>
<string>XMLRPC Library</string>
</map>
<key>type</key>
<string>autobuild</string>
<key>version</key>
<string>1.3</string>
</map></llsd>
</map>
</llsd>
6 changes: 3 additions & 3 deletions build-cmd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ 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" CXX="clang++" \
./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
Expand All @@ -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
Expand Down