From 9ed05d2af0779844e84a2855e40b5d45f335e1eb Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Tue, 5 Jan 2016 01:54:56 +0100
Subject: [PATCH] Fix directory name of the advanced plugin
---
Makefile | 21 +++++++++++----------
ordernumbers_woocommerce.php | 1 +
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 3609316..fb7301a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DIR = $(shell pwd)
SVNDIR=wordpress-plugin-svn
BUILDDIR=.build/
-BASICBUILDDIR=$(VENDOR)-$(PLATTFORM)-$(BASE)-basic
-ADVBUILDDIR=$(VENDOR)-$(PLATTFORM)-$(BASE)-advanced
+BASICBUILDDIR=$(PLATTFORM)-basic-$(BASE)
+ADVBUILDDIR=$(PLATTFORM)-advanced-$(BASE)
PLUGINFILES=library assets ordernumber_helper_woocommerce.php ordernumbers_woocommerce_basic.php readme.txt LICENSE.txt
BASICPLUGINFILES=woocommerce-basic-ordernumbers.php
@@ -23,19 +23,20 @@ all: zip
zip: $(PLUGINFILES) $(ADVPLUGINFILES) $(BASICPLUGINFILES) $(TRANSLATIONS)
echo $(DIR)
@echo "Packing basic plugin version into distribution file $(ZIPFILE):"
- mkdir -p $(BUILDDIR)/$(BASICBUILDDIR)
- cp --parents -r $(PLUGINFILES) $(BASICPLUGINFILES) $(TRANSLATIONS) $(BUILDDIR)/$(BASICBUILDDIR)
+ @mkdir -p $(BUILDDIR)/$(BASICBUILDDIR)
+ @cp --parents -r $(PLUGINFILES) $(BASICPLUGINFILES) $(TRANSLATIONS) $(BUILDDIR)/$(BASICBUILDDIR)
cd $(BUILDDIR) && zip -r $(DIR)/$(ZIPFILE) $(BASICBUILDDIR)
# @zip -r
- mkdir -p $(BUILDDIR)/$(ADVBUILDDIR)
- echo `pwd`mak
- cp --parents -r $(PLUGINFILES) $(ADVPLUGINFILES) $(TRANSLATIONS) $(BUILDDIR)/$(ADVBUILDDIR)
- cp readme-adv.txt $(BUILDDIR)/$(ADVBUILDDIR)/readme.txt
- cd $(BUILDDIR) && zip -r $(DIR)/$(ADVZIPFILE) $(ADVBUILDDIR)
+ @echo "Packing advanced plugin version into distribution file $(ADVZIPFILE):"
+ @mkdir -p $(BUILDDIR)/$(ADVBUILDDIR)
+ echo `pwd`
+ @cp --parents -r $(PLUGINFILES) $(ADVPLUGINFILES) $(TRANSLATIONS) $(BUILDDIR)/$(ADVBUILDDIR)
+ @cp readme-adv.txt $(BUILDDIR)/$(ADVBUILDDIR)/readme.txt
+ @cd $(BUILDDIR) && zip -r $(DIR)/$(ADVZIPFILE) $(ADVBUILDDIR)
cd $(DIR)
clean:
- rm -f $(ZIPFILE) $(ADVZIPFILE) $(BUILDDIR) $(ADVBUILDDIR)
+ rm -rf $(ZIPFILE) $(ADVZIPFILE) $(BUILDDIR) $(ADVBUILDDIR)
$(SVNDIR)/tags/$(VERSION) :
cd $(SVNDIR) && svn cp trunk tags/$(VERSION)
diff --git a/ordernumbers_woocommerce.php b/ordernumbers_woocommerce.php
index e3e0729..86c1ff2 100644
--- a/ordernumbers_woocommerce.php
+++ b/ordernumbers_woocommerce.php
@@ -43,6 +43,7 @@ class OpenToolsOrdernumbers extends OpenToolsOrdernumbersBasic {
// Install hooks for third-party plugin support:
$this->thirdparty_wpo_wcpdf_init();
+
}
protected function initializeSettingsGeneral() {
--
GitLab