Skip to content

Commit

Permalink
fix(build): Re-organize rules so sources don't have platform detectio…
Browse files Browse the repository at this point in the history
…n artifacts
  • Loading branch information
alerque committed Jan 4, 2025
1 parent 4493ef7 commit 15a20e0
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ BUILT_SOURCES_LUA = core/features.lua core/pathsetup.lua core/version.lua

bin_PROGRAMS = sile
bin_SCRIPTS = sile-lua
pkglib_LIBRARIES =
nodist_man_MANS =
dist_man_MANS = sile-lua.1
sile_SOURCES = src/bin/sile.rs src/lib.rs src/cli.rs src/types.rs src/types/semver.rs
Expand Down Expand Up @@ -134,7 +135,7 @@ $(CARGO_BIN): justenough/.libs/justenoughlibtexpdf.a
$(CARGO_BIN): justenough/.libs/svg.a
$(CARGO_BIN): libtexpdf/.libs/libtexpdf.a
if !EMBEDDED_RESOURCES
$(CARGO_BIN): rusile$(LIBEXT)
$(CARGO_BIN): $(pkglib_LIBRARIES)
endif !EMBEDDED_RESOURCES

src/embed-includes.rs: Makefile-distfiles
Expand Down
3 changes: 3 additions & 0 deletions build-aux/que_libext.m4
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@ AC_DEFUN_ONCE([QUE_LIBEXT], [
LIBEXT=.so
;;
esac
AM_CONDITIONAL([LIB_IS_SO], [test $LIBEXT = .so])
AM_CONDITIONAL([LIB_IS_DYLIB], [test $LIBEXT = .dylib])
AM_CONDITIONAL([LIB_IS_DLL], [test $LIBEXT = .dll])
AC_SUBST([LIBEXT])
])
2 changes: 1 addition & 1 deletion build-aux/que_rust_boilerplate.m4
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ AC_DEFUN([QUE_RUST_MODULE], [
AX_ADD_AM_MACRO([dnl
EXTRA_DIST += build-aux/que_rust_module.am
$($SED -E "s/@MODULE@/$1/g;s/@LIBEXT@/$LIBEXT/g;s/@_LIBEXT@/${LIBEXT##.}/g" build-aux/que_rust_module.am)
$($SED -E "s/@MODULE@/$1/g" build-aux/que_rust_module.am)
])dnl
])
40 changes: 36 additions & 4 deletions build-aux/que_rust_module.am
Original file line number Diff line number Diff line change
@@ -1,8 +1,40 @@
pkglib_LIBRARIES = @MODULE@@LIBEXT@
@MODULE@_@_LIBEXT@_SOURCES = @MODULE@/Cargo.toml @MODULE@/src/lib.rs @MODULE@/build.rs
@MODULE@_srcs = @MODULE@/Cargo.toml @MODULE@/src/lib.rs @MODULE@/build.rs

@builddir@/target/@RUST_TARGET_SUBDIR@/lib@MODULE@@LIBEXT@: $(@MODULE@_@_LIBEXT@_SOURCES)
if LIB_IS_SO
pkglib_LIBRARIES += rusile.so
@MODULE@_so_SOURCES = $(@MODULE@_srcs)
endif

if LIB_IS_DYLIB
pkglib_LIBRARIES += rusile.dylib
@MODULE@_dylib_SOURCES = $(@MODULE@_srcs)
endif

if LIB_IS_DLL
pkglib_LIBRARIES += rusile.dll
@MODULE@_dll_SOURCES = $(@MODULE@_srcs)
endif

@MODULE@_so_AR = :
@MODULE@_so_RANLIB = :
@MODULE@_so_LINK = :

@MODULE@_dylib_AR = :
@MODULE@_dylib_RANLIB = :
@MODULE@_dylib_LINK = :

@MODULE@_dll_AR = :
@MODULE@_dll_RANLIB = :
@MODULE@_dll_LINK = :

@builddir@/target/@RUST_TARGET_SUBDIR@/lib@[email protected] @builddir@/target/@RUST_TARGET_SUBDIR@/lib@[email protected] @builddir@/target/@RUST_TARGET_SUBDIR@/lib@[email protected]: $(@MODULE@_srcs)
$(CARGO_ENV) $(CARGO) build $(CARGO_VERBOSE) --target $(CARGO_TARGET_TRIPLE) $(@MODULE@_FEATURE_ARGS) $(CARGO_RELEASE_ARGS) -p @MODULE@

@MODULE@@LIBEXT@: @builddir@/target/@RUST_TARGET_SUBDIR@/lib@MODULE@@LIBEXT@
@[email protected]: @builddir@/target/@RUST_TARGET_SUBDIR@/lib@[email protected]
$(INSTALL) $< $@

@[email protected]: @builddir@/target/@RUST_TARGET_SUBDIR@/lib@[email protected]
$(INSTALL) $< $@

@[email protected]: @builddir@/target/@RUST_TARGET_SUBDIR@/lib@[email protected]
$(INSTALL) $< $@

0 comments on commit 15a20e0

Please sign in to comment.