Skip to content

Commit f91e712

Browse files
Refactor build support files into build_support directory
1 parent 31b3e0d commit f91e712

12 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
run: |
9292
mkdir installer
9393
cp gambit* installer
94-
"${WIX}bin/candle" gambit.wxs
94+
"${WIX}bin/candle" build_support/gambit.wxs
9595
"${WIX}bin/light" -ext WixUIExtension gambit.wixobj
9696
- uses: actions/upload-artifact@v5
9797
with:

Makefile.am

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
ACLOCAL_AMFLAGS = -I m4
2424

2525
EXTRA_DIST = \
26-
gambit.wxs \
27-
contrib/mac/Info.plist \
26+
build_support/gambit.wxs \
27+
build_support/mac/Info.plist \
2828
contrib/mac/gambit.icns \
2929
src/labenski/README.txt \
3030
src/labenski/art/grab.xpm \
@@ -373,7 +373,7 @@ bin_PROGRAMS += gambit
373373
endif
374374

375375
# Read version from GAMBIT_VERSION file for use in compilation
376-
GAMBIT_VERSION = $(shell cat $(top_srcdir)/GAMBIT_VERSION)
376+
GAMBIT_VERSION = $(shell cat $(top_srcdir)/build_support/GAMBIT_VERSION)
377377

378378
# Define VERSION for all C++ compilations and set include paths
379379
AM_CPPFLAGS = -I$(top_srcdir)/src -DVERSION=\"$(GAMBIT_VERSION)\"
@@ -623,7 +623,7 @@ osx-bundle:
623623
-mkdir Gambit.app/Contents
624624
-mkdir Gambit.app/Contents/MacOS
625625
-mkdir Gambit.app/Contents/Resources
626-
cp ${top_srcdir}/contrib/mac/Info.plist Gambit.app/Contents
626+
cp ${top_srcdir}/build_support/mac/Info.plist Gambit.app/Contents
627627
cp ${top_srcdir}/contrib/mac/gambit.icns Gambit.app/Contents/Resources/gambit.icns
628628
echo -n 'APPL????' > Gambit.app/Contents/PkgInfo
629629
cp gambit Gambit.app/Contents/MacOS/gambit
@@ -639,7 +639,7 @@ osx-dmg: osx-bundle
639639
msw-msi:
640640
-mkdir installer
641641
cp gambit* installer
642-
candle gambit.wxs
642+
candle build_support/gambit.wxs
643643
light -ext WixUIExtension gambit.wixobj
644644

645645
clang-tidy:
File renamed without changes.

gambit.wxs.in renamed to build_support/gambit.wxs.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@
6464
<ComponentRef Id="ApplicationShortcut"/>
6565
</Feature>
6666
</Product>
67-
</Wix>
67+
</Wix>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@
8484
</dict>
8585
</array>
8686
</dict>
87-
</plist>
87+
</plist>

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ AC_SUBST(WX_CXXFLAGS)
145145
REZFLAGS=`echo $CXXFLAGS $WX_CXXFLAGS | sed 's/-mthreads//g' | sed 's/-g//g' | sed 's/-O. / /g' | sed 's/-I/--include-dir /g'`
146146
AC_SUBST(REZFLAGS)
147147

148-
GAMBIT_VERSION=`cat GAMBIT_VERSION`
148+
GAMBIT_VERSION=`cat build_support/GAMBIT_VERSION`
149149
AC_SUBST(GAMBIT_VERSION)
150150

151-
AC_CONFIG_FILES([Makefile contrib/mac/Info.plist gambit.wxs])
151+
AC_CONFIG_FILES([Makefile build_support/mac/Info.plist build_support/gambit.wxs])
152152
AC_OUTPUT

doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
# built documents.
5757
#
5858

59-
_version_file = pathlib.Path(__file__).parent.parent / "GAMBIT_VERSION"
59+
_version_file = pathlib.Path(__file__).parent.parent / "build_support/GAMBIT_VERSION"
6060
if _version_file.exists():
6161
_full_version = _version_file.read_text().strip()
6262
# The short X.Y version.

doc/developer.contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@ When making a new release of Gambit, follow these steps:
180180

181181
1. Create a new branch from the latest commit on the ``master`` branch named ``maintX_Y``, where ``X`` is the major version number and ``Y`` is the minor version number of the new release.
182182

183-
2. Update the version number in the ``GAMBIT_VERSION`` file at the root of the repository to ``X.Y.Z``.
183+
2. Update the version number in the ``build_support/GAMBIT_VERSION`` file to ``X.Y.Z``.
184184

185185
All other files will automatically use the updated version number:
186186

187187
- `pyproject.toml` reads from GAMBIT_VERSION file at build time
188-
- `configure.ac` reads from GAMBIT_VERSION file and substitutes into `Info.plist` and `gambit.wxs`
188+
- `configure.ac` reads from GAMBIT_VERSION file and substitutes into `build_support/mac/Info.plist` and `build_support/gambit.wxs`
189189
- `src/pygambit/__init__.py` reads from installed package metadata or GAMBIT_VERSION file
190190
- `doc/conf.py` reads from GAMBIT_VERSION file at documentation build time
191191
- Documentation pages reference the `|release|` substitution variable to automatically reflect the updated version number.

0 commit comments

Comments
 (0)