Author: ydario
Date: Mon Mar 12 17:52:38 2012
New Revision: 1299759
URL: http://svn.apache.org/viewvc?rev=1299759&view=rev
Log:
i118923 - OS/2 port: improve r1299242, quotes must be removed in perl code, fix
exclusion patterns.
Modified:
incubator/ooo/trunk/main/solenv/bin/zipdep.pl
incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk
incubator/ooo/trunk/main/solenv/inc/tg_zip.mk
Modified: incubator/ooo/trunk/main/solenv/bin/zipdep.pl
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/zipdep.pl?rev=1299759&r1=1299758&r2=1299759&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/zipdep.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/zipdep.pl Mon Mar 12 17:52:38 2012
@@ -95,6 +95,11 @@ sub convert_slashes {
my $path = shift;
$path =~ s/\//\$\//g;
$path =~ s/\\/\$\//g;
+ if ( $^O eq 'os2' )
+ {
+ # remove also quotes surrounding name, thus writing buggy paths
+ $path =~ s/\"//g;
+ }
return $path;
};
Modified: incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk?rev=1299759&r1=1299758&r2=1299759&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/_tg_zip.mk Mon Mar 12 17:52:38 2012
@@ -8,7 +8,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -137,7 +137,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -266,7 +266,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -395,7 +395,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -524,7 +524,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -653,7 +653,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -782,7 +782,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -911,7 +911,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -1040,7 +1040,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
@@ -1169,7 +1169,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
Modified: incubator/ooo/trunk/main/solenv/inc/tg_zip.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/tg_zip.mk?rev=1299759&r1=1299758&r2=1299759&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/tg_zip.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/tg_zip.mk Mon Mar 12 17:52:38 2012
@@ -32,7 +32,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELIF "$(GUI)"=="OS2"
command_seperator=&&
EQ=\\
-avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\"
+avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.ELSE
command_seperator=;
EQ=
