From 67114e257b6b75f49c37c1735ada7633e0c14ab8 Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI <p.pittoli@unistra.fr>
Date: Thu, 12 Sep 2019 17:30:39 +0200
Subject: [PATCH] Renaming package => packaging.

---
 Makefile         | 51 +++++++++++++++++++++++++-----------------------
 project.zsh      | 12 ++++++------
 shard.yml        |  4 ++--
 src/config.cr.in |  2 +-
 src/main.cr      |  2 +-
 5 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/Makefile b/Makefile
index ffcacf1..7b75ef3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PACKAGE = 'package'
+PACKAGE = 'packaging'
 VERSION = '0.8.0'
 
 PREFIX := /usr/local
@@ -19,39 +19,39 @@ LDFLAGS :=
 
 Q := @
 
-all: package assemble-apk.sh src/config.cr
+all: packaging assemble-apk.sh src/config.cr
 	@:
 
-package: src/main.cr src/config.cr src/context.cr src/exception.cr src/instructions.cr src/main.cr src/package.cr src/recipe.cr src/sources.cr src/config.cr 
-	@echo '  CR >    package'
-	$(Q)crystal src/main.cr -o 'package'
+packaging: src/main.cr src/backends.cr src/context.cr src/exception.cr src/instructions.cr src/main.cr src/package.cr src/recipe.cr src/sources.cr src/config.cr 
+	@echo '  CR >    packaging'
+	$(Q)crystal src/main.cr -o 'packaging'
 
 
-package.install: package
-	@echo '  IN >    $(BINDIR)/package'
+packaging.install: packaging
+	@echo '  IN >    $(BINDIR)/packaging'
 	$(Q)mkdir -p '$(DESTDIR)$(BINDIR)'
-	$(Q)install -m0755 package $(DESTDIR)$(BINDIR)/package
+	$(Q)install -m0755 packaging $(DESTDIR)$(BINDIR)/packaging
 
-package.clean:
-	@echo '  RM >    package'
-	$(Q)rm -f package
+packaging.clean:
+	@echo '  RM >    packaging'
+	$(Q)rm -f packaging
 
-package.uninstall:
-	@echo '  RM >    $(BINDIR)/package'
-	$(Q)rm -f '$(DESTDIR)$(BINDIR)/package'
+packaging.uninstall:
+	@echo '  RM >    $(BINDIR)/packaging'
+	$(Q)rm -f '$(DESTDIR)$(BINDIR)/packaging'
 
 assemble-apk.sh:
 
 assemble-apk.sh.install: assemble-apk.sh
-	@echo '  IN >    $(LIBEXECDIR)/package/assemble-apk.sh'
-	$(Q)mkdir -p '$(DESTDIR)$(LIBEXECDIR)/package'
-	$(Q)install -m0755 assemble-apk.sh $(DESTDIR)$(LIBEXECDIR)/package/assemble-apk.sh
+	@echo '  IN >    $(LIBEXECDIR)/packaging/assemble-apk.sh'
+	$(Q)mkdir -p '$(DESTDIR)$(LIBEXECDIR)/packaging'
+	$(Q)install -m0755 assemble-apk.sh $(DESTDIR)$(LIBEXECDIR)/packaging/assemble-apk.sh
 
 assemble-apk.sh.clean:
 
 assemble-apk.sh.uninstall:
-	@echo '  RM >    $(LIBEXECDIR)/package/assemble-apk.sh'
-	$(Q)rm -f '$(DESTDIR)$(LIBEXECDIR)/package/assemble-apk.sh'
+	@echo '  RM >    $(LIBEXECDIR)/packaging/assemble-apk.sh'
+	$(Q)rm -f '$(DESTDIR)$(LIBEXECDIR)/packaging/assemble-apk.sh'
 
 src/config.cr: src/config.cr.in src
 	@echo '  SED >   src/config.cr'
@@ -90,12 +90,12 @@ $(DESTDIR)$(INCLUDEDIR):
 $(DESTDIR)$(MANDIR):
 	@echo '  DIR >   $(MANDIR)'
 	$(Q)mkdir -p $(DESTDIR)$(MANDIR)
-install: subdirs.install package.install assemble-apk.sh.install src/config.cr.install
+install: subdirs.install packaging.install assemble-apk.sh.install src/config.cr.install
 	@:
 
 subdirs.install:
 
-uninstall: subdirs.uninstall package.uninstall assemble-apk.sh.uninstall src/config.cr.uninstall
+uninstall: subdirs.uninstall packaging.uninstall assemble-apk.sh.uninstall src/config.cr.uninstall
 	@:
 
 subdirs.uninstall:
@@ -105,7 +105,7 @@ test: all subdirs subdirs.test
 
 subdirs.test:
 
-clean: package.clean assemble-apk.sh.clean src/config.cr.clean
+clean: packaging.clean assemble-apk.sh.clean src/config.cr.clean
 
 distclean: clean
 
@@ -121,6 +121,7 @@ $(PACKAGE)-$(VERSION).tar.gz: distdir
 	@echo '  TAR >   $(PACKAGE)-$(VERSION).tar.gz'
 	$(Q)tar czf $(PACKAGE)-$(VERSION).tar.gz \
 		$(PACKAGE)-$(VERSION)/src/config.cr.in \
+		$(PACKAGE)-$(VERSION)/src/backends.cr \
 		$(PACKAGE)-$(VERSION)/src/context.cr \
 		$(PACKAGE)-$(VERSION)/src/exception.cr \
 		$(PACKAGE)-$(VERSION)/src/instructions.cr \
@@ -135,6 +136,7 @@ $(PACKAGE)-$(VERSION).tar.xz: distdir
 	@echo '  TAR >   $(PACKAGE)-$(VERSION).tar.xz'
 	$(Q)tar cJf $(PACKAGE)-$(VERSION).tar.xz \
 		$(PACKAGE)-$(VERSION)/src/config.cr.in \
+		$(PACKAGE)-$(VERSION)/src/backends.cr \
 		$(PACKAGE)-$(VERSION)/src/context.cr \
 		$(PACKAGE)-$(VERSION)/src/exception.cr \
 		$(PACKAGE)-$(VERSION)/src/instructions.cr \
@@ -149,6 +151,7 @@ $(PACKAGE)-$(VERSION).tar.bz2: distdir
 	@echo '  TAR >   $(PACKAGE)-$(VERSION).tar.bz2'
 	$(Q)tar cjf $(PACKAGE)-$(VERSION).tar.bz2 \
 		$(PACKAGE)-$(VERSION)/src/config.cr.in \
+		$(PACKAGE)-$(VERSION)/src/backends.cr \
 		$(PACKAGE)-$(VERSION)/src/context.cr \
 		$(PACKAGE)-$(VERSION)/src/exception.cr \
 		$(PACKAGE)-$(VERSION)/src/instructions.cr \
@@ -159,7 +162,7 @@ $(PACKAGE)-$(VERSION).tar.bz2: distdir
 		$(PACKAGE)-$(VERSION)/src/config.cr
 
 help:
-	@echo ' :: package-0.8.0'
+	@echo ' :: packaging-0.8.0'
 	@echo ''
 	@echo 'Generic targets:'
 	@echo '    - help           Prints this help message.'
@@ -185,7 +188,7 @@ help:
 	@echo '    - VERSION        ${VERSION}'
 	@echo ''
 	@echo 'Project targets: '
-	@echo '    - package        crystal'
+	@echo '    - packaging      crystal'
 	@echo '    - assemble-apk.sh script'
 	@echo ''
 	@echo 'Makefile options:'
diff --git a/project.zsh b/project.zsh
index ebeaf1a..68293bf 100644
--- a/project.zsh
+++ b/project.zsh
@@ -1,5 +1,5 @@
 
-package=package
+package=packaging
 version=0.8.0
 
 variables+=(
@@ -8,11 +8,11 @@ variables+=(
 	VERSION     "$version"
 )
 
-targets=(package assemble-apk.sh)
+targets=(packaging assemble-apk.sh)
 
-type[package]=crystal
-sources[package]=src/main.cr
-depends[package]="$(echo src/*.cr | sed 's| src/config.cr||') src/config.cr"
+type[packaging]=crystal
+sources[packaging]=src/main.cr
+depends[packaging]="$(echo src/*.cr | sed 's| src/config.cr||') src/config.cr"
 
 type[assemble-apk.sh]=script
 
@@ -33,5 +33,5 @@ function script.install {
 	fi
 }
 
-install[assemble-apk.sh]='$(LIBEXECDIR)/package'
+install[assemble-apk.sh]='$(LIBEXECDIR)/packaging'
 
diff --git a/shard.yml b/shard.yml
index 620e152..9f7d7c9 100644
--- a/shard.yml
+++ b/shard.yml
@@ -1,5 +1,5 @@
-name: package
-version: 0.1.1
+name: packaging
+version: 0.1.2
 
 # authors:
 #   - name <email@example.com>
diff --git a/src/config.cr.in b/src/config.cr.in
index 16f69d2..9a2d34f 100644
--- a/src/config.cr.in
+++ b/src/config.cr.in
@@ -1,6 +1,6 @@
 
 # These values are changed by `make` at build-time.
-OWN_LIBEXEC_DIR        = "@LIBEXECDIR@/package"
+OWN_LIBEXEC_DIR        = "@LIBEXECDIR@/packaging"
 SYSCONF_DIR            = "@SYSCONFDIR@"
 
 module Package
diff --git a/src/main.cr b/src/main.cr
index f073b6a..bf03ecc 100644
--- a/src/main.cr
+++ b/src/main.cr
@@ -10,7 +10,7 @@ extend Package
 context = Context.new()
 context.repositories << "."
 
-configuration_file = "#{SYSCONF_DIR}/package.cfg"
+configuration_file = "#{SYSCONF_DIR}/packaging.cfg"
 configuration_file_requested = false
 
 requested_recipes = [] of String