Skip to content

Commit

Permalink
build system: remove duplicate package script
Browse files Browse the repository at this point in the history
Having to maintain two copies of the package script in the git repo
has been a years-long nuisance. Since we abandoned the idea of the
INIT system as a package manager long ago (see e.g. beb3c64), and
there is no longer any automated licence inserting nonsense (see
594f309 and a34e831), there is no longer any purpose to a source
copy existing in src/cmd/INIT. We can simply keep bin/package.

src/cmd/INIT/package.sh:
- Removed.

src/cmd/INIT/Mamfile:
- No longer install 'package' in the arch directory either.
  • Loading branch information
McDutchie committed Feb 5, 2024
1 parent 3bd7e69 commit 199d708
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3,339 deletions.
14 changes: 1 addition & 13 deletions src/cmd/INIT/Mamfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?
setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
setv LDFLAGS
note *
note * initialization for all packages
note * initialization for the build system
note *
make install virtual
make iffe
Expand All @@ -26,10 +26,6 @@ make install virtual
prev mktest.sh
exec - ${STDCP} mktest.sh mktest && ${STDCHMOD} u+w,+x mktest
done
make package
prev package.sh
exec - ${STDCP} package.sh package && ${STDCHMOD} u+w,+x package
done
make regress
prev regress.sh
exec - ${STDCP} regress.sh regress && ${STDCHMOD} u+w,+x regress
Expand Down Expand Up @@ -73,21 +69,13 @@ make install virtual
prev mktest
exec - ${STDCP} -f mktest ${INSTALLROOT}/bin/mktest
done
make ${INSTALLROOT}/bin/package
prev package
exec - ${STDCP} -f package ${INSTALLROOT}/bin/package
done
make ${INSTALLROOT}/bin/regress
prev regress
exec - ${STDCP} -f regress ${INSTALLROOT}/bin/regress
done
make ${PACKAGEROOT}/bin
exec - mkdir -p ${PACKAGEROOT}/bin
done
make ${PACKAGEROOT}/bin/package
prev package
exec - ${STDCP} -f package ${PACKAGEROOT}/bin/package
done
make ${INSTALLROOT}/bin/crossexec
prev crossexec
exec - ${STDCP} -f crossexec ${INSTALLROOT}/bin/crossexec
Expand Down
Loading

0 comments on commit 199d708

Please sign in to comment.