Niminst now bundles the compiler dir when packaging.

This commit is contained in:
Dominik Picheta 2016-06-06 00:04:07 +01:00
commit cb76f266fa
4 changed files with 71 additions and 16 deletions

View file

@ -1,5 +1,5 @@
#? stdtmpl(subsChar = '?') | standard
#proc generateInstallScript(c: ConfigData): string =
#proc generateInstallScript(c: ConfigData): string =
# result = "#! /bin/sh\n# Generated by niminst\n"
# var proj = c.name.toLower
@ -8,7 +8,7 @@ set -e
if [ $# -eq 1 ] ; then
# if c.cat[fcUnixBin].len > 0:
if test -f ?{c.cat[fcUnixBin][0].toUnix}
then
then
echo "?c.displayName build detected"
else
echo "Please build ?c.displayName before installing it"
@ -34,6 +34,7 @@ if [ $# -eq 1 ] ; then
libdir=/usr/lib/?proj
docdir=/usr/share/?proj/doc
datadir=/usr/share/?proj/data
nimbleDir="/opt/nimble/pkgs/?c.nimblePkgName-?c.version/"
;;
"/usr/local/bin")
bindir=/usr/local/bin
@ -41,6 +42,18 @@ if [ $# -eq 1 ] ; then
libdir=/usr/local/lib/?proj
docdir=/usr/local/share/?proj/doc
datadir=/usr/local/share/?proj/data
nimbleDir="/opt/nimble/pkgs/?c.nimblePkgName-?c.version"
;;
"/opt")
bindir="/opt/?proj/bin"
configdir="/opt/?proj/config"
libdir="/opt/?proj/lib"
docdir="/opt/?proj/doc"
datadir="/opt/?proj/data"
nimbleDir="/opt/nimble/pkgs/?c.nimblePkgName-?c.version"
mkdir -p /opt/?proj
mkdir -p $bindir
mkdir -p $configdir
;;
*)
bindir="$1/?proj/bin"
@ -48,25 +61,29 @@ if [ $# -eq 1 ] ; then
libdir="$1/?proj/lib"
docdir="$1/?proj/doc"
datadir="$1/?proj/data"
nimbleDir="$1/?proj"
mkdir -p $1/?proj
mkdir -p $bindir
mkdir -p $configdir
;;
esac
mkdir -p $libdir
mkdir -p $docdir
mkdir -p $nimbleDir/
echo "copying files..."
#var createdDirs = newStringTable()
#for cat in fcConfig..fcLib:
#for cat in {fcConfig..fcLib, fcNimble}:
# for f in items(c.cat[cat]):
# var mk = splitFile(f.skipRoot).dir
# if mk.len > 0:
# if cat != fcNimble:
# mk = unixDirVars[cat] & "/" & mk
# if not createdDirs.hasKey(mk):
# createdDirs[mk] = "true"
# else:
# mk = "$nimbleDir" / splitFile(f).dir
# end if
# if mk.len > 0 and not createdDirs.hasKey(mk):
# createdDirs[mk] = "true"
mkdir -p ?{mk.toUnix}
# end if
# end if
# end for
#end for
@ -75,11 +92,11 @@ if [ $# -eq 1 ] ; then
cp ?f.toUnix $bindir/?f.skipRoot.toUnix
chmod 755 $bindir/?f.skipRoot.toUnix
#end for
#for f in items(c.cat[fcConfig]):
#for f in items(c.cat[fcConfig]):
cp ?f.toUnix $configdir/?f.skipRoot.toUnix
chmod 644 $configdir/?f.skipRoot.toUnix
#end for
#for f in items(c.cat[fcData]):
#for f in items(c.cat[fcData]):
if [ -f ?f.toUnix ]; then
cp ?f.toUnix $datadir/?f.skipRoot.toUnix
chmod 644 $datadir/?f.skipRoot.toUnix
@ -95,7 +112,13 @@ if [ $# -eq 1 ] ; then
cp ?f.toUnix $libdir/?f.skipRoot.toUnix
chmod 644 $libdir/?f.skipRoot.toUnix
#end for
#for f in items(c.cat[fcNimble]):
cp ?f.toUnix $nimbleDir/?f.toUnix
chmod 644 $nimbleDir/?f.toUnix
#end for
cp ?{c.nimblePkgName}.nimble $nimbleDir/?{c.nimblePkgName}.nimble
chmod 644 $nimbleDir/?{c.nimblePkgName}.nimble
echo "installation successful"
else
echo "?c.displayName installation script"