[svn:parrot] r36796 - in trunk: config/gen/makefiles tools/dev tools/install
fperrad at svn.parrot.org
fperrad at svn.parrot.org
Mon Feb 16 17:57:38 UTC 2009
Author: fperrad
Date: Mon Feb 16 17:57:37 2009
New Revision: 36796
URL: https://trac.parrot.org/parrot/changeset/36796
Log:
[install] on Win32, don't use version in install path
Modified:
trunk/config/gen/makefiles/root.in
trunk/tools/dev/mk_inno.pl
trunk/tools/dev/mk_inno_language.pl
trunk/tools/install/smoke.pl
trunk/tools/install/smoke_languages.pl
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in Mon Feb 16 11:23:07 2009 (r36795)
+++ trunk/config/gen/makefiles/root.in Mon Feb 16 17:57:37 2009 (r36796)
@@ -2131,7 +2131,7 @@
--includedir=$(INCLUDE_DIR) \
--destdir=$(DESTDIR) \
--docdir=$(DOC_DIR) \
- --version=$(VERSION) \
+#UNLESS(win32): --version=$(VERSION) \
MANIFEST MANIFEST.generated
install-dev: install
@@ -2145,7 +2145,7 @@
--destdir=$(DESTDIR) \
--docdir=$(DOC_DIR) \
--datadir=$(DATA_DIR) \
- --version=$(VERSION) \
+#UNLESS(win32): --version=$(VERSION) \
MANIFEST MANIFEST.generated
###############################################################################
Modified: trunk/tools/dev/mk_inno.pl
==============================================================================
--- trunk/tools/dev/mk_inno.pl Mon Feb 16 11:23:07 2009 (r36795)
+++ trunk/tools/dev/mk_inno.pl Mon Feb 16 17:57:37 2009 (r36796)
@@ -68,7 +68,7 @@
DefaultDirName={sd}$prefix
DefaultGroupName=Parrot
AllowNoIcons=yes
-LicenseFile=$prefix\\share\\doc\\parrot\\$version\\LICENSE
+LicenseFile=$prefix\\share\\doc\\parrot\\LICENSE
OutputDir=.\\
OutputBaseFilename=setup-parrot-$version
Compression=lzma
Modified: trunk/tools/dev/mk_inno_language.pl
==============================================================================
--- trunk/tools/dev/mk_inno_language.pl Mon Feb 16 11:23:07 2009 (r36795)
+++ trunk/tools/dev/mk_inno_language.pl Mon Feb 16 17:57:37 2009 (r36796)
@@ -49,13 +49,13 @@
? qq{Source: ".\\languages\\$lang\\*.cmd"; DestDir: "{app}\\bin"; Flags:}
: '; no .cmd';
my $pbc = <languages/$lang/*.pbc>
- ? qq{Source: ".\\languages\\$lang\\*.pbc"; DestDir: "{app}\\lib\\parrot\\$version\\languages\\$lang"; Flags:}
+ ? qq{Source: ".\\languages\\$lang\\*.pbc"; DestDir: "{app}\\lib\\parrot\\languages\\$lang"; Flags:}
: '; no .pbc';
my $pmc = <languages/$lang/src/pmc/*.pmc>
- ? qq{Source: ".\\languages\\$lang\\src\\pmc\\*.dll"; DestDir: "{app}\\lib\\parrot\\$version\\dynext"; Flags:}
+ ? qq{Source: ".\\languages\\$lang\\src\\pmc\\*.dll"; DestDir: "{app}\\lib\\parrot\\dynext"; Flags:}
: '; no pmc';
my $ops = <languages/$lang/src/ops/*.ops>
- ? qq{Source: ".\\languages\\$lang\\src\\ops\\*.dll"; DestDir: "{app}\\lib\\parrot\\$version\\dynext"; Flags:}
+ ? qq{Source: ".\\languages\\$lang\\src\\ops\\*.dll"; DestDir: "{app}\\lib\\parrot\\dynext"; Flags:}
: '; no ops';
my $filename = 'parrot-' . $lclang . '.iss';
Modified: trunk/tools/install/smoke.pl
==============================================================================
--- trunk/tools/install/smoke.pl Mon Feb 16 11:23:07 2009 (r36795)
+++ trunk/tools/install/smoke.pl Mon Feb 16 17:57:37 2009 (r36796)
@@ -86,11 +86,11 @@
my $version = $1;
my $libdir = ($bindir eq 'bin')
- ? "lib/parrot/$version/library"
+ ? ($^O eq 'MSWin32') ? 'lib/parrot/library' : "lib/parrot/$version/library"
: 'runtime/parrot/library';
my $compdir = ($bindir eq 'bin')
- ? "lib/parrot/$version/languages"
+ ? ($^O eq 'MSWin32') ? 'lib/parrot/languages' : "lib/parrot/$version/languages"
: 'compilers';
#
Modified: trunk/tools/install/smoke_languages.pl
==============================================================================
--- trunk/tools/install/smoke_languages.pl Mon Feb 16 11:23:07 2009 (r36795)
+++ trunk/tools/install/smoke_languages.pl Mon Feb 16 17:57:37 2009 (r36796)
@@ -71,7 +71,7 @@
my $version = $1;
my $langdir = ($bindir eq 'bin')
- ? "lib/parrot/$version/languages"
+ ? ($^O eq 'MSWin32') ? 'lib/parrot/languages' : "lib/parrot/$version/languages"
: 'languages';
#
More information about the parrot-commits
mailing list