Skip to content

Commit

Permalink
DRTVWR-578: promote actions branch to master
Browse files Browse the repository at this point in the history
  • Loading branch information
nat-goodspeed authored Oct 25, 2023
2 parents 8fb4b3b + e935465 commit cc00284
Show file tree
Hide file tree
Showing 482 changed files with 121,051 additions and 129,586 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:

- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly

- package-ecosystem: pip
directory: /
schedule:
interval: monthly
18 changes: 18 additions & 0 deletions .github/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
changelog:
exclude:
labels:
- ignore-for-release
authors:
- dependabot
categories:
- title: Breaking Changes 🛠
labels:
- semver-major
- breaking-change
- title: New Features 🎉
labels:
- semver-minor
- enhancement
- title: Other Changes
labels:
- '*'
30 changes: 30 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Build
on: [push]
jobs:
build:
strategy:
matrix:
os: [windows-2022, macos-11] # , ubuntu-22.04]
addrsize: ["64"]
include:
- os: windows-2022
addrsize: "32"
continue-on-error: false
runs-on: ${{ matrix.os }}
steps:
- name: Install macOS dependencies
if: runner.os == 'macOS'
run: brew install automake

- 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@v1
with:
public: true
15 changes: 14 additions & 1 deletion .hgignore → .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
syntax: glob
stage/
*.exe
autobuild-parabuild-bootstrap/
.*.swp
.DS_Store
Expand All @@ -21,3 +21,16 @@ apr/LibR
apr/Release
apr-util/xml/expat/lib/LibD
apr-util/xml/expat/lib/LibR
config.log
*.o
*.lo
*.la
Makefile
*.mk
libtool
*.pc
*-config.out
.libs
.make.dirs
*.exp
config.status
18 changes: 0 additions & 18 deletions .hgtags

This file was deleted.

43 changes: 26 additions & 17 deletions README.LINDEN.WINDOWS.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
In order to facilitate building on Windows, the APR project is distributed with a set of Visual Studio 6 .dsw and .dsp files.
Since we use a newer build toolchain, they must first be imported and converted to the new file format (e.g. .sln and .vcxproj
for VS2010). If this autobuild package fails to build on Windows after upgrading to a new version, it may be necessary to
reimport the newer VS6 files to pick up changes in the files that make up APR.
In order to facilitate building on Windows, the APR project is distributed
with a set of Visual Studio 6 .dsw and .dsp files. Since we use a newer build
toolchain, they must first be imported and converted to the new file format
(e.g. .sln and .vcxproj for VS2010). If this autobuild package fails to build
on Windows after upgrading to a new version, it may be necessary to reimport
the newer VS6 files to pick up changes in the files that make up APR.

After importing the Visual Studio 6 .dsw files into VS2010, the link information for each of the projects was missing. The
build for libapriconv and libaprutil failed during the link step because they depend on libapr and other libs. In this commit,
I have fixed the problem in the respective vcxproj files, however, if this library is upgraded again and the VS6 dsw file is
imported again, it is likely that the information will be lost on import again. The process I followed to set up the link
information is below:
After importing the Visual Studio 6 .dsw files into VS2010, the link
information for each of the projects was missing. The build for libapriconv
and libaprutil failed during the link step because they depend on libapr and
other libs. In this commit, I have fixed the problem in the respective vcxproj
files, however, if this library is upgraded again and the VS6 dsw file is
imported again, it is likely that the information will be lost on import
again. The process I followed to set up the link information is below:

1. Open the aprutil.sln solution that was created by importing the aprutil.dsw file.
1. Open the aprutil.sln solution that was created by importing the aprutil.dsw
file.

2. Right click the project you need to fix (libapriconv or libaprutil) and choose properties.
2. Right click the project you need to fix (libapriconv or libaprutil) and
choose properties.

3. Expand VC++ Directories and edit the Library Directories line. At the end, append a path to the directory containing the
.lib file you would like to link. Relative paths work.
3. Expand VC++ Directories and edit the Library Directories line. At the end,
append a path to the directory containing the .lib file you would like to
link. Relative paths work.

4. Expand the linker tab in the sidebar and select input. Prepend the name of the .lib file you are linking.
4. Expand the linker tab in the sidebar and select input. Prepend the name of
the .lib file you are linking.

The process above needs to be repeated for both the debug and release targets of each library that is fixed. I chose to link
the expat lib file from the 3p-expat autobuild package instead of the one generated by the xml project included in the apr
source distribution.
The process above needs to be repeated for both the debug and release targets
of each library that is fixed. I chose to link the expat lib file from the
3p-expat autobuild package instead of the one generated by the xml project
included in the apr source distribution.
7 changes: 7 additions & 0 deletions apr-iconv/CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
-*- coding: utf-8 -*-
Changes with APR-ICONV 1.2.2

*) Win32: Resolve build issues with modern Visual Studio toolchains.
Specifically changed the handling of precompiled headers; the .obj
file which contains a traceable flavor of the intrinsic functions
is now required. [William Rowe]

Changes with APR-ICONV 1.2.1

*) Build schema fixes for win32 including VC8 precompiled header files,
Expand Down
5 changes: 4 additions & 1 deletion apr-iconv/NOTICE
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
This product includes software developed by
Apache Portable Runtime ICONV Charset Conversion Library
Copyright (c) 2000-2017 The Apache Software Foundation.

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
38 changes: 38 additions & 0 deletions apr-iconv/apriconv.dep
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Microsoft Developer Studio Generated Dependency File, included by apriconv.mak

.\lib\iconv.c : \
".\include\apr_iconv.h"\
".\lib\iconv.h"\


.\lib\iconv_ces.c : \
".\include\apr_iconv.h"\
".\lib\iconv.h"\


.\lib\iconv_ces_euc.c : \
".\include\apr_iconv.h"\
".\lib\iconv.h"\


.\lib\iconv_ces_iso2022.c : \
".\include\apr_iconv.h"\
".\lib\iconv.h"\


.\lib\iconv_int.c : \
".\include\apr_iconv.h"\
".\lib\iconv.h"\


.\lib\iconv_module.c : \
".\include\api_version.h"\
".\include\apr_iconv.h"\
".\lib\charset_alias.h"\
".\lib\iconv.h"\


.\lib\iconv_uc.c : \
".\include\apr_iconv.h"\
".\lib\iconv.h"\

Loading

0 comments on commit cc00284

Please sign in to comment.