Move jsongenerator to root script directory

This commit is contained in:
Xavier Guimard 2015-12-28 05:38:44 +00:00
parent dab3c4866d
commit bdf650497e
3 changed files with 14 additions and 15 deletions

View File

@ -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

View File

@ -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",
);

12
scripts/jsongenerator.pl Executable file
View File

@ -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",
);