Skip to content
Snippets Groups Projects
Commit 2bb7012c authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

provide seed file for tree named session, allow to pass version at configure script

parent 918e0e2e
Branches master
Tags 0.8.0
No related merge requests found
...@@ -15,10 +15,12 @@ include package/targets.mak ...@@ -15,10 +15,12 @@ include package/targets.mak
INSTALL := ./tools/install.sh INSTALL := ./tools/install.sh
install: install-module install-script install: install-module install-script install-seed
install-module: $(MODULE_TARGET:module/%=$(DESTDIR)$(service_directory)/$(package)/%) install-module: $(MODULE_TARGET:module/%=$(DESTDIR)$(service_directory)/$(package)/%)
install-script: $(SCRIPT_TARGET:module/configure/%=$(DESTDIR)$(service_directory)/$(package)/configure/%) install-script: $(SCRIPT_TARGET:module/configure/%=$(DESTDIR)$(service_directory)/$(package)/configure/%)
install-seed: $(SEED_TARGET:module/configure/session=$(DESTDIR)$(seed_directory)/session)
$(DESTDIR)$(service_directory)/$(package)/%: module/% $(DESTDIR)$(service_directory)/$(package)/%: module/%
exec $(INSTALL) -D -m 644 $< $@ exec $(INSTALL) -D -m 644 $< $@
...@@ -32,6 +34,9 @@ $(DESTDIR)$(service_directory)/$(package)/configure/%: module/configure/% ...@@ -32,6 +34,9 @@ $(DESTDIR)$(service_directory)/$(package)/configure/%: module/configure/%
exec $(INSTALL) -D -m 755 $< $@ exec $(INSTALL) -D -m 755 $< $@
sed -i -e 's,@BINDIR@,$(bindir),' $@ sed -i -e 's,@BINDIR@,$(bindir),' $@
$(DESTDIR)$(seed_directory)/session: module/configure/session
exec $(INSTALL) -D -m 644 $< $@
version: version:
@echo $(version) @echo $(version)
......
...@@ -16,12 +16,14 @@ Fine tuning of the installation directories: ...@@ -16,12 +16,14 @@ Fine tuning of the installation directories:
--bindir=BINDIR user executables [EPREFIX/bin] --bindir=BINDIR user executables [EPREFIX/bin]
--datarootdir=DATAROOTDIR read-only architecture-independent data root [PREFIX/share] --datarootdir=DATAROOTDIR read-only architecture-independent data root [PREFIX/share]
--with-system-service=DIR 66 service intallation directory [DATAROOTDIR/$package_macro_dir/service] --with-system-service=DIR 66 service intallation directory [DATAROOTDIR/$package_macro_dir/service]
--with-system-seed=DIR system trees default configuration[DATAROOTDIR/$package_macro_dir/seed]
Fine tunning of boot-user configuration: Fine tunning of boot-user configuration:
--DISPLAY_MANAGER=VALUE display manager to use [] --DISPLAY_MANAGER=VALUE display manager to use []
--CONSOLE_TRACKER=VALUE console tracker to use [] --CONSOLE_TRACKER=VALUE console tracker to use []
--XDG_RUNTIME=BOOLEAN create and mount the XDG_RUNTIME directory [!yes] --XDG_RUNTIME=BOOLEAN create and mount the XDG_RUNTIME directory [!yes]
--DESKTOP_CMDLINE=VALUE commandline to use in the .xinitrc file [!jwm] --DESKTOP_CMDLINE=VALUE commandline to use in the .xinitrc file [!jwm]
--version=VALUE version of the service[0.0.1]
Use yes or no with lowercase character to set BOOLEAN values. Use yes or no with lowercase character to set BOOLEAN values.
...@@ -88,10 +90,12 @@ exec_prefix='$prefix' ...@@ -88,10 +90,12 @@ exec_prefix='$prefix'
bindir='$exec_prefix/bin' bindir='$exec_prefix/bin'
datarootdir='$prefix/share' datarootdir='$prefix/share'
service_directory='$datarootdir/$package_macro_dir/service' service_directory='$datarootdir/$package_macro_dir/service'
seed_directory='$datarootdir/$package_macro_dir/seed'
DISPLAY_MANAGER= DISPLAY_MANAGER=
CONSOLE_TRACKER= CONSOLE_TRACKER=
XDG_RUNTIME='!yes' XDG_RUNTIME='!yes'
DESKTOP_CMDLINE='!jwm' DESKTOP_CMDLINE='!jwm'
version='0.0.1'
for arg ; do for arg ; do
case "$arg" in case "$arg" in
...@@ -101,10 +105,12 @@ for arg ; do ...@@ -101,10 +105,12 @@ for arg ; do
--bindir=*) bindir=${arg#*=} ;; --bindir=*) bindir=${arg#*=} ;;
--datarootdir=*) datarootdir=${arg#*=} ;; --datarootdir=*) datarootdir=${arg#*=} ;;
--with-system-service=*) service_directory=${arg#*=} ;; --with-system-service=*) service_directory=${arg#*=} ;;
--with-system-seed=*) seed_directory=${arg#*=} ;;
--DISPLAY_MANAGER=*) DISPLAY_MANAGER=${arg#*=} ;; --DISPLAY_MANAGER=*) DISPLAY_MANAGER=${arg#*=} ;;
--CONSOLE_TRACKER=*) CONSOLE_TRACKER=${arg#*=} ;; --CONSOLE_TRACKER=*) CONSOLE_TRACKER=${arg#*=} ;;
--XDG_RUNTIME=*) XDG_RUNTIME=${arg#*=} ;; --XDG_RUNTIME=*) XDG_RUNTIME=${arg#*=} ;;
--DESKTOP_CMDLINE=*) DESKTOP_CMDLINE=${arg#*=} ;; --DESKTOP_CMDLINE=*) DESKTOP_CMDLINE=${arg#*=} ;;
--version=*) version=${arg#*=} ;;
-* ) echo "$0: unknown option $arg" ;; -* ) echo "$0: unknown option $arg" ;;
*=*) ;; *=*) ;;
*) target=$arg ;; *) target=$arg ;;
...@@ -121,14 +127,14 @@ fi ...@@ -121,14 +127,14 @@ fi
# Expand installation directories # Expand installation directories
stripdir prefix stripdir prefix
for i in exec_prefix bindir datarootdir \ for i in exec_prefix bindir datarootdir \
service_directory; do seed_directory service_directory; do
eval tmp=\${$i} eval tmp=\${$i}
eval $i=$tmp eval $i=$tmp
stripdir $i stripdir $i
done done
stripdir datarootdir stripdir datarootdir
for i in service_directory; do for i in service_directory seed_directory; do
eval tmp=\${$i} eval tmp=\${$i}
eval $i=$tmp eval $i=$tmp
stripdir $i stripdir $i
...@@ -171,14 +177,14 @@ cat << EOF ...@@ -171,14 +177,14 @@ cat << EOF
# This file was generated by: # This file was generated by:
# $cmdline # $cmdline
# Any changes made here will be lost if configure is re-run. # Any changes made here will be lost if configure is re-run.
package := $package
version := $version version := $version
package := $package
prefix := $prefix prefix := $prefix
exec_prefix := $exec_prefix exec_prefix := $exec_prefix
bindir := $bindir bindir := $bindir
datarootdir := $datarootdir datarootdir := $datarootdir
service_directory := $service_directory service_directory := $service_directory
seed_directory := $seed_directory
package_macro_dir := $package_macro_dir package_macro_dir := $package_macro_dir
$DISPLAY_MANAGER $DISPLAY_MANAGER
$CONSOLE_TRACKER $CONSOLE_TRACKER
......
allow = root
groups = admin
depends = global
configure 0755 configure 0755
.xsession 0755 .xsession 0755
.xinitrc 0755 .xinitrc 0755
seed 0644
\ No newline at end of file
...@@ -3,5 +3,6 @@ module/configure/configure \ ...@@ -3,5 +3,6 @@ module/configure/configure \
module/configure/.xinitrc \ module/configure/.xinitrc \
module/configure/.xsession module/configure/.xsession
MODULE_TARGET := $(shell find module/ -type f) MODULE_TARGET := $(shell find module/ -type f)
SEED_TARGET := module/configure/session
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment