diff --git a/Makefile b/Makefile index e0a1852bf..8168cd2a1 100644 --- a/Makefile +++ b/Makefile @@ -182,7 +182,7 @@ json: $(MANAGERJSONDST) $(MANAGERJSONDST): $(MANAGERJSONSRC) cd $(SRCMANAGERDIR) && ./scripts/jsongenerator.pl && cd - -configure: common_conf handler_conf portal_conf manager_conf +configure: json common_conf handler_conf portal_conf manager_conf common_conf: ${SRCCOMMONDIR}/Makefile diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm index 2fb41f655..eb0906f63 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm @@ -1,4 +1,4 @@ -# This file is generated by ./scripts/jsongenerator.pl. Don't modify it by hand +# This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand package Lemonldap::NG::Common::Conf::DefaultValues; our $VERSION = '1.9.0'; diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm index 05ec4c6ed..84daeff58 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm @@ -1,4 +1,4 @@ -# This file is generated by ./scripts/jsongenerator.pl. Don't modify it by hand +# This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand package Lemonldap::NG::Manager::Attributes; our $VERSION = '1.9.0'; diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm index 5b229db23..85e4b04e4 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm @@ -20,6 +20,7 @@ has defaultValuesFile => ( isa => 'Str', is => 'ro', required => 1 ); my @managerAttrKeys = qw(keyTest type test msgFail default); my $format = 'Creating %-69s: '; my $reIgnoreKeys = qr/^$/; +my $module = __PACKAGE__; my @angularScopeVars; my @cnodesKeys; @@ -53,7 +54,7 @@ $Data::Dumper::Sortkeys = sub { sub run { my $self = shift; - $self = __PACKAGE__->new(@_) unless ref $self; + $self = $module->new(@_) unless ref $self; # 1. confTree.js printf STDERR $format, $self->confTreeFile; @@ -136,7 +137,7 @@ sub run { . join( 'Keys $', 'simpleHash', 'specialNode', sort keys %cnodesRe ) . 'Keys $specialNodeHash @sessionTypes'; print F <{get} // $jleaf->{title}; - # my $js = getData($file); - # $jleaf->{get} = $file = $file . ".json"; - # open F, ">app/confs/$opts{f}/$file" - # or die $!; - # print F $js; - # close F; - #} if ( $prefix and !$jleaf->{get} ) { $jleaf->{get} = $prefix . $jleaf->{title}; } @@ -378,20 +366,5 @@ sub scanTree { } } -__END__ -sub getData { - die $opts{f} unless $opts{f} =~ /^\d+$/; - my $k = shift; - my $q = "/confs/$opts{f}/$k"; - return $run->( - { - HTTP_ACCEPT => 'application/json', - PATH_INFO => $q, - QUERY_STRING => '', - REQUEST_URI => $q, - REQUEST_METHOD => 'GET', - } - )->[2]->[0]; -} - 1; +__END__ diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm index 60bdae38f..62782bc9b 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm @@ -1,4 +1,4 @@ -# This file is generated by ./scripts/jsongenerator.pl. Don't modify it by hand +# This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand package Lemonldap::NG::Manager::Constants; use strict;