[Libreoffice-commits] .: solenv/bin

François Tigeot ftigeot at kemper.freedesktop.org
Sun Apr 24 23:06:26 PDT 2011


 solenv/bin/build.pl         |    5 ----
 solenv/bin/deliver.pl       |    4 ---
 solenv/bin/fix_def_file.cmd |   46 --------------------------------------------
 solenv/bin/fix_def_ord.cmd  |   19 ------------------
 solenv/bin/fix_dxp_file.cmd |   26 ------------------------
 solenv/bin/fix_exp_file.cmd |   44 ------------------------------------------
 solenv/bin/fix_lin_file.cmd |   13 ------------
 solenv/bin/fix_shl.cmd      |   11 ----------
 8 files changed, 168 deletions(-)

New commits:
commit 7233f6db5294cf565a4c63ca51a8cb5bcf872d8c
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Mon Apr 25 08:05:22 2011 +0200

    Remove OS/2 code.

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 7b8568c..b03ebd4 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2681,11 +2681,6 @@ sub do_exit {
     my $exit_code = shift;
     $build_finished++;
     generate_html_file(1);
-    if ( $^O eq 'os2' )
-    {
-        # perl 5.10 returns 'resource busy' for rmtree
-        rmdir(correct_path($tmp_dir)) if ($tmp_dir);
-    }
     rmtree(correct_path($tmp_dir), 0, 0) if ($tmp_dir);
     print STDERR "Cannot delete $tmp_dir. Please remove it manually\n" if (-d $tmp_dir);
     exit($exit_code);
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 0ca8dd0..70d3c8f 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -823,10 +823,6 @@ sub copy_if_newer
             }   
         }
         fix_file_permissions($$from_stat_ref[2], $temp_file);
-        if ( $^O eq 'os2' )
-        {
-            $rc = unlink($to); # YD OS/2 can't rename if $to exists!
-        }
         # Ugly hack: on windows file locking(?) sometimes prevents renaming.
         # Until we've found and fixed the real reason try it repeatedly :-(
         my $try = 0;
diff --git a/solenv/bin/fix_def_file.cmd b/solenv/bin/fix_def_file.cmd
deleted file mode 100644
index 3f303c8..0000000
--- a/solenv/bin/fix_def_file.cmd
+++ /dev/null
@@ -1,46 +0,0 @@
-/* os2 build scripts
-
-this script is used to process def results
-
-*/
-
-lmax = 0
-smax = ''
-ordinal = 1
-
-do while( lines())
-
-	l = strip(linein())
-	l = strip(l,,X2C(9))
-	l = strip(l,,";")
-	if LEFT( l,4) \= 'Java' THEN l = '_'l
-
-	/* remove comments */
-	if POS(';', l) > 0 then l = LEFT( l, POS(';', l)-1)
-	if POS('#', l) > 0 then l = LEFT( l, POS('#', l)-1)
-	/* remove wildcards */
-	if POS('*', l) > 0 then l = ''
-
-	/* remove empty lines */
-	if l = '_' then l = ''
-
-	/* remove component_getDescriptionFunc, since it is already added by tg_def */
-	if l = '_component_getDescriptionFunc' then l = ''
-	if l = '_GetVersionInfo' then l = ''
-
-	/* remove GLOBAL symbols */
-
-	IF LENGTH(l)>0 THEN DO
-	  say l
-  	  ordinal = ordinal + 1
-	END
-
-	if LENGTH(l)>lmax then do
-          lmax = LENGTH(l)
-          smax = l
-        end
-
-end
-
-say ';lmax='lmax
-say ';smax='smax
diff --git a/solenv/bin/fix_def_ord.cmd b/solenv/bin/fix_def_ord.cmd
deleted file mode 100644
index a308edd..0000000
--- a/solenv/bin/fix_def_ord.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-/* os2 build scripts
-
-this script is used to process def results.
-Adds ordinal number to every line.
-
-*/
-
-lmax = 0
-smax = ''
-
-ord = 1
-do while( lines())
-
-	l = linein()
-	IF LENGTH(l)>0 THEN DO
-  	  say l 
-	  ord = ord + 1
-	END
-end
diff --git a/solenv/bin/fix_dxp_file.cmd b/solenv/bin/fix_dxp_file.cmd
deleted file mode 100644
index bcad4e9..0000000
--- a/solenv/bin/fix_dxp_file.cmd
+++ /dev/null
@@ -1,26 +0,0 @@
-/* os2 build scripts
-
-this script is used to process dxp files produced from .map
-
-*/
-
-do while( lines())
-
-	l = linein()
-
-	l = strip(l)
-	l = strip(l,,X2C(9))
-	l = strip(l,,";")
-	if LEFT( l,4) \= 'Java' THEN l = '_'l
-
-	/* remove empty lines */
-	if l = '_' then l = ''
-
-	/* remove component_getDescriptionFunc, since it is already added by tg_def */
-	if l = '_component_getDescriptionFunc' then l = ''
-	if l = '_GetVersionInfo' then l = ''
-
-
-	say l
-
-end
diff --git a/solenv/bin/fix_exp_file.cmd b/solenv/bin/fix_exp_file.cmd
deleted file mode 100644
index fc2a619..0000000
--- a/solenv/bin/fix_exp_file.cmd
+++ /dev/null
@@ -1,44 +0,0 @@
-/* os2 build scripts
-
-this script is used to process emxexp results
-
-*/
-
-lmax = 0
-ordinal = 1
-
-do while( lines())
-
-	l = strip(linein())
-	if POS(';', l) > 0 then l = LEFT(l,POS(';', l)-1)
-
-	l = strip(translate(l,'','"'))
-	l = strip(l,,X2C(9))
-
-	/* remove empty lines */
-	if l = '_' then l = ''
-
-	/* remove component_getDescriptionFunc, since it is already added by tg_def */
-	if l = '_component_getDescriptionFunc' then l = ''
-	if l = '_GetVersionInfo' then l = ''
-
-
-	/* remove GLOBAL symbols */
-	if POS('_GLOBAL_', l) > 0 then l = ';'l
-
-	if POS(';', l) > 0 then l = LEFT(l,POS(';', l)-1)
-
-	IF LENGTH(l)>0 THEN DO
-	  say l
-  	  ordinal = ordinal + 1
-	END
-
-	if LENGTH(l)>lmax then do
-          lmax = LENGTH(l)
-          smax = l
-        end
-
-end
-
-say ';lmax='lmax
-say ';smax='smax
diff --git a/solenv/bin/fix_lin_file.cmd b/solenv/bin/fix_lin_file.cmd
deleted file mode 100644
index 0d074ce..0000000
--- a/solenv/bin/fix_lin_file.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-/* os2 build scripts
-*/
-
-parse arg dir
-
-do while( lines())
-
-	l = linein()
-
-	/* skip empty lines */
-	if l \= '' then say dir || '\' || l
-
-end
diff --git a/solenv/bin/fix_shl.cmd b/solenv/bin/fix_shl.cmd
deleted file mode 100644
index ca13abb..0000000
--- a/solenv/bin/fix_shl.cmd
+++ /dev/null
@@ -1,11 +0,0 @@
-/* os2 build scripts
-
-will return a 8.3 conformant name for modname.
-
-21/02/2006 Actually this is a simple truncation, seems nothing more needed.
-
-*/
-
-parse arg modname
-if pos('.',modname)>0 then modname = left(modname, pos('.',modname)-1)
-say strip(left(modname,8))


More information about the Libreoffice-commits mailing list