Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
37670e11
Commit
37670e11
authored
Dec 03, 2012
by
Viktor Horvath
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Makefile separation: Makefile.PL runs at instantiation, but with errors.
parent
9278d2c2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
11 deletions
+24
-11
slapos/recipe/mioga/instantiate.py
slapos/recipe/mioga/instantiate.py
+1
-0
software/mioga/mioga-patch
software/mioga/mioga-patch
+23
-11
No files found.
slapos/recipe/mioga/instantiate.py
View file @
37670e11
...
@@ -101,6 +101,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -101,6 +101,7 @@ class Recipe(GenericBaseRecipe):
self
.
options
[
'libxml2_bin'
],
self
.
options
[
'libxml2_bin'
],
self
.
options
[
'postgres_bin'
],
self
.
options
[
'postgres_bin'
],
environ
[
'PATH'
]
])
environ
[
'PATH'
]
])
environ
[
'MIOGA_SITEPERL'
]
=
self
.
options
[
'mioga_siteperl'
]
# Write the Postgres password file
# Write the Postgres password file
pgpassfilepath
=
os
.
path
.
join
(
self
.
options
[
'instance_root'
],
'.pgpass'
)
pgpassfilepath
=
os
.
path
.
join
(
self
.
options
[
'instance_root'
],
'.pgpass'
)
...
...
software/mioga/mioga-patch
View file @
37670e11
...
@@ -12,18 +12,21 @@ index ef0f369..b275a48 100644
...
@@ -12,18 +12,21 @@ index ef0f369..b275a48 100644
This script must be run by cron in a day basis with apache user (www-data for Debian)
This script must be run by cron in a day basis with apache user (www-data for Debian)
diff --git a/Makefile.PL b/Makefile.PL
diff --git a/Makefile.PL b/Makefile.PL
index 3582d20..
262e2c2
100644
index 3582d20..
46608ca
100644
--- a/Makefile.PL
--- a/Makefile.PL
+++ b/Makefile.PL
+++ b/Makefile.PL
@@ -22,6 +22,7 @@
@@ -20,8 +20,10 @@
# ============================================================================
+use Cwd;
use ExtUtils::MakeMaker;
use ExtUtils::MakeMaker;
use ExtUtils::MakeMaker::Config;
use ExtUtils::MakeMaker::Config;
+use File::Find;
+use File::Find;
# ****************************************************************************
# ****************************************************************************
#
#
@@ -67,6 +6
8
,7 @@
sub CheckPreDepends {
@@ -67,6 +6
9
,7 @@
sub CheckPreDepends {
my $disable_check = grep {lc($_) eq 'disable_check'} @ARGV;
my $disable_check = grep {lc($_) eq 'disable_check'} @ARGV;
...
@@ -31,7 +34,7 @@ index 3582d20..262e2c2 100644
...
@@ -31,7 +34,7 @@ index 3582d20..262e2c2 100644
CheckPreDepends({ # 'Data::Dumper' => '2.101',
CheckPreDepends({ # 'Data::Dumper' => '2.101',
# 'DBI' => '1.13',
# 'DBI' => '1.13',
# 'DBD::Pg' => '1.01',
# 'DBD::Pg' => '1.01',
@@ -75,7 +7
7
,8 @@
CheckPreDepends({ # 'Data::Dumper' => '2.101',
@@ -75,7 +7
8
,8 @@
CheckPreDepends({ # 'Data::Dumper' => '2.101',
'Error' => '0.15',
'Error' => '0.15',
# 'Net::LDAP' => '0.25',
# 'Net::LDAP' => '0.25',
# 'Unicode::String' => '2.06',
# 'Unicode::String' => '2.06',
...
@@ -41,7 +44,7 @@ index 3582d20..262e2c2 100644
...
@@ -41,7 +44,7 @@ index 3582d20..262e2c2 100644
require MiogaConf;
require MiogaConf;
@@ -115,7 +11
8
,7 @@
my $docsubdirs = "docs";
@@ -115,7 +11
9
,7 @@
my $docsubdirs = "docs";
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
sub MY::processPL {
sub MY::processPL {
return '
return '
...
@@ -50,7 +53,7 @@ index 3582d20..262e2c2 100644
...
@@ -50,7 +53,7 @@ index 3582d20..262e2c2 100644
# between "all" and next "tardist"
# between "all" and next "tardist"
include config.mk
include config.mk
@@ -124,10 +12
7
,7 @@
tardist: doc
@@ -124,10 +12
8
,7 @@
tardist: doc
dist: doc
dist: doc
install ::
install ::
if test -e $(TMP_DIR) ; then \
if test -e $(TMP_DIR) ; then \
...
@@ -62,7 +65,7 @@ index 3582d20..262e2c2 100644
...
@@ -62,7 +65,7 @@ index 3582d20..262e2c2 100644
echo "===> File $(TMP_DIR) exists but is not a directory ..." ; \
echo "===> File $(TMP_DIR) exists but is not a directory ..." ; \
exit 1 ; \
exit 1 ; \
fi \
fi \
@@ -156,6 +15
6
,31 @@
install-all ::
@@ -156,6 +15
7
,31 @@
install-all ::
(cd web && $(MAKE) setperms) || exit 1;
(cd web && $(MAKE) setperms) || exit 1;
...
@@ -94,18 +97,27 @@ index 3582d20..262e2c2 100644
...
@@ -94,18 +97,27 @@ index 3582d20..262e2c2 100644
doc:
doc:
for i in ' . $docsubdirs . ' ; \
for i in ' . $docsubdirs . ' ; \
do \
do \
@@ -176,9 +20
1,17
@@
installall: install install-all
@@ -176,9 +20
2,26
@@
installall: install install-all
#
#
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
+my $Mioga2_pm = 'lib/Mioga2.pm';
+my $Mioga2_pm = 'lib/Mioga2.pm';
+if ((not -e $lib_Mioga2_pm) and exists($ENV{MIOGA_SITEPERL})) {
+foreach my $envkey (keys %ENV) {
+ print "VHH DEBUG: found envvar $envkey\n";
+}
+if ((not -e $Mioga2_pm) and exists($ENV{MIOGA_SITEPERL})) {
+ print "VHH DEBUG: looking into SITEPERL\n";
+ my $findfile = sub {
+ my $findfile = sub {
+ $Mioga2_pm = $File::Find::name if $_ eq 'Mioga2.pm';
+ if ($_ eq 'Mioga2.pm') {
+ $Mioga2_pm = $File::Find::name;
+ print "VHH DEBUG: Found Mioga2.pm in $Mioga2_pm\n";
+ }
+ };
+ };
+ find($findfile, $ENV{MIOGA_SITEPERL});
+ find($findfile, $ENV{MIOGA_SITEPERL});
+};
+};
+
+print "VHH DEBUG: Found finally: $Mioga2_pm\n";
+print 'VHH DEBUG: SIZE = ' . ( stat($Mioga2_pm) )[8] . "\n";
+print "VHH DEBUG: Current directory is ".getcwd."\n";
WriteMakefile(
WriteMakefile(
'NAME' => 'Mioga',
'NAME' => 'Mioga',
'DIR' => ['bin', 'web', 'locales', 'docs', 'sql'],
'DIR' => ['bin', 'web', 'locales', 'docs', 'sql'],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment