From bdf650497eeec9e3fb40156b61baa9d4c8652d41 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Mon, 28 Dec 2015 05:38:44 +0000 Subject: [PATCH] Move jsongenerator to root script directory --- Makefile | 4 ++-- lemonldap-ng-manager/scripts/jsongenerator.pl | 13 ------------- scripts/jsongenerator.pl | 12 ++++++++++++ 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 100755 lemonldap-ng-manager/scripts/jsongenerator.pl create mode 100755 scripts/jsongenerator.pl diff --git a/Makefile b/Makefile index 8168cd2a1..f3afe3714 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ EXAMPLELANG=en # For static Manager example only ERASECONFIG=1 # Set to 0 if you do not want to replace your configuration # GENERATED SRC FILESlemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm -MANAGERJSONSRC=$(SRCMANAGERDIR)/scripts/jsongenerator.pl \ +MANAGERJSONSRC= scripts/jsongenerator.pl \ $(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Build.pm \ $(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Build/Attributes.pm \ $(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Build/Tree.pm @@ -180,7 +180,7 @@ all: configure common handler manager portal json: $(MANAGERJSONDST) $(MANAGERJSONDST): $(MANAGERJSONSRC) - cd $(SRCMANAGERDIR) && ./scripts/jsongenerator.pl && cd - + ./scripts/jsongenerator.pl configure: json common_conf handler_conf portal_conf manager_conf diff --git a/lemonldap-ng-manager/scripts/jsongenerator.pl b/lemonldap-ng-manager/scripts/jsongenerator.pl deleted file mode 100755 index 1eab6ad91..000000000 --- a/lemonldap-ng-manager/scripts/jsongenerator.pl +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/perl -Ilib/ -I../lemonldap-ng-common/lib/ -w - -use Lemonldap::NG::Manager::Build; - -Lemonldap::NG::Manager::Build->run( - structFile => "site/static/struct.json", - confTreeFile => "site/static/js/conftree.js", - managerConstantsFile => "lib/Lemonldap/NG/Manager/Constants.pm", - managerAttributesFile => 'lib/Lemonldap/NG/Manager/Attributes.pm', - defaultValuesFile => - "../lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm", -); - diff --git a/scripts/jsongenerator.pl b/scripts/jsongenerator.pl new file mode 100755 index 000000000..ef922d32e --- /dev/null +++ b/scripts/jsongenerator.pl @@ -0,0 +1,12 @@ +#!/usr/bin/perl -Ilemonldap-ng-manager/lib/ -Ilemonldap-ng-common/lib/ -w + +use Lemonldap::NG::Manager::Build; + +Lemonldap::NG::Manager::Build->run( + structFile => "lemonldap-ng-manager/site/static/struct.json", + confTreeFile => "lemonldap-ng-manager/site/static/js/conftree.js", + managerConstantsFile => "lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm", + managerAttributesFile => 'lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm', + defaultValuesFile => "lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm", +); +