rpms/openoffice.org/devel openoffice.org.spec, 1.445, 1.446 workspace.dmake43p01.patch, 1.4, 1.5
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 5 19:03:54 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3232
Modified Files:
openoffice.org.spec workspace.dmake43p01.patch
Log Message:
another massively parallel test
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- openoffice.org.spec 5 Sep 2005 14:50:15 -0000 1.445
+++ openoffice.org.spec 5 Sep 2005 19:03:41 -0000 1.446
@@ -1,5 +1,5 @@
%define ooo2ver 127
-%define ooo_rpm_release 1.cmc2
+%define ooo_rpm_release 1.cmc3
%define build_fc4 0
%define build_fc5 1
@@ -175,7 +175,6 @@
Patch55: openoffice.org-1.9.127.gcc23691.slideshow.patch
Patch56: workspace.dmake43p01.patch
Patch57: workspace.cmcfixes17.patch
-Patch58: openoffice.org-1.9.127.ooo54236.parallel.sysui.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -833,7 +832,6 @@
%patch55 -p1 -b .gcc23691.slideshow.patch
%patch56 -p1 -b .dmake43p01.patch
%patch57 -p1 -b .workspace.cmcfixes17.patch
-%patch58 -p1 -b .ooo54236.parallel.sysui.patch
%if %{includeexternals}
#start ludicrous workaround
workspace.dmake43p01.patch:
dmake/ChangeLog | 1999 ++++++++++++++++++++++++++-
dmake/Makefile.am | 9
dmake/Makefile.in | 54
dmake/NEWS | 56
dmake/acinclude.m4 | 13
dmake/aclocal.m4 | 435 +----
dmake/autogen.sh | 37
dmake/config.h.in | 3
dmake/configure | 330 ++--
dmake/configure.in | 135 -
dmake/dag.c | 9
dmake/dmake.c | 25
dmake/dmake.h | 2
dmake/dmakeroot.h.in | 6
dmake/dmdump.c | 5
dmake/expand.c | 99 +
dmake/function.c | 98 +
dmake/getinp.c | 107 -
dmake/imacs.c | 7
dmake/infer.c | 32
dmake/mac/ruletab.c | 2
dmake/make.c | 34
dmake/makefile.mk | 6
dmake/man/dmake.nc | 1490 ++++++++++----------
dmake/man/dmake.tf | 111 +
dmake/msdos/Makefile.in | 14
dmake/msdos/ruletab.c | 2
dmake/msdos/startup.h | 2
dmake/msdos/zortech/startup.mk | 8
dmake/os2/ruletab.c | 2
dmake/parse.c | 7
dmake/posix.h | 3
dmake/qssl/ruletab.c | 2
dmake/qssl/startup.h | 3
dmake/readme/read1st.txt | 13
dmake/rulparse.c | 47
dmake/startup/Makefile.am | 6
dmake/startup/Makefile.in | 47
dmake/startup/msdos/macros.mk | 6
dmake/startup/os2/macros.mk | 6
dmake/startup/startup.mk | 4
dmake/startup/unix/Makefile.am | 2
dmake/startup/unix/Makefile.in | 38
dmake/startup/unix/cygwin/Makefile.in | 14
dmake/startup/unix/linux/Makefile.in | 14
dmake/startup/unix/macosx/Makefile.in | 14
dmake/startup/unix/solaris/Makefile.in | 14
dmake/startup/unix/sysvr4/Makefile.in | 14
dmake/startup/win95/macros.mk | 6
dmake/startup/winnt/Makefile.am | 2
dmake/startup/winnt/Makefile.in | 38
dmake/startup/winnt/macros.mk | 6
dmake/startup/winnt/mingw/Makefile.in | 14
dmake/startup/winnt/msvc6/Makefile.in | 14
dmake/stdmacs.h | 3
dmake/sysintf.c | 46
dmake/tempnam.c | 2
dmake/tos/ruletab.c | 2
dmake/tos/startup.h | 3
dmake/unix/Makefile.in | 14
dmake/unix/dcache.c | 3
dmake/unix/ruletab.c | 2
dmake/unix/runargv.c | 61
dmake/vextern.h | 7
dmake/win95/Makefile.in | 34
dmake/win95/borland/ruletab.c | 4
dmake/win95/borland/sysintf.h | 4
dmake/win95/microsft/Makefile.in | 14
dmake/win95/microsft/config.h | 9
dmake/win95/microsft/config.mk | 7
dmake/win95/microsft/ruletab.c | 4
dmake/win95/microsft/sysintf.h | 2
dmake/win95/microsft/vpp40/mk.bat | 70
dmake/win95/startup.h | 2
dmake/winnt/borland/ruletab.c | 4
dmake/winnt/borland/sysintf.h | 4
dmake/winnt/microsft/config.h | 11
dmake/winnt/microsft/ruletab.c | 4
dmake/winnt/microsft/sysintf.h | 4
dmake/winnt/mingw/sysintf.h | 2
dmake/winnt/startup.h | 2
openoffice.org/dmake/startup/config.mk.in | 5
openoffice.org/dmake/tests/Makefile.am | 9
openoffice.org/dmake/tests/Makefile.in | 367 ++++
openoffice.org/dmake/tests/function_macros-1 | 96 +
openoffice.org/dmake/tests/function_macros-2 | 64
openoffice.org/dmake/tests/function_macros-3 | 40
openoffice.org/dmake/tests/infra-0 | 42
openoffice.org/dmake/tests/macros-1 | 40
openoffice.org/dmake/tests/misc-1 | 34
openoffice.org/dmake/tests/misc-2 | 39
openoffice.org/dmake/tests/recipes-1 | 37
92 files changed, 4901 insertions(+), 1662 deletions(-)
Index: workspace.dmake43p01.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.dmake43p01.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.dmake43p01.patch 5 Sep 2005 08:53:26 -0000 1.4
+++ workspace.dmake43p01.patch 5 Sep 2005 19:03:41 -0000 1.5
@@ -1,3 +1,5 @@
+? mylog
+? workspace.dmake43p01.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/tools/dmake/ChangeLog,v
@@ -3693,10 +3695,10 @@
===================================================================
RCS file: /cvs/tools/dmake/dmake.c,v
retrieving revision 1.5
-retrieving revision 1.5.2.5
-diff -u -p -r1.5 -r1.5.2.5
+retrieving revision 1.5.2.6
+diff -u -p -r1.5 -r1.5.2.6
--- openoffice.org.orig/dmake/dmake.c 22 Oct 2004 08:04:42 -0000 1.5
-+++ openoffice.org/dmake/dmake.c 4 Sep 2005 19:38:14 -0000 1.5.2.5
++++ openoffice.org/dmake/dmake.c 5 Sep 2005 17:23:44 -0000 1.5.2.6
@@ -141,6 +141,10 @@ char **argv;
Create_macro_vars();
Catch_signals(Quit);
@@ -3712,7 +3714,7 @@
m_export = FALSE;
cmdmacs = NIL(char);
targets = NIL(char);
-+ Is_shell_exec = FALSE;
++ Shell_exec_target = NIL(CELL);
- Verbose = V_NONE;
+ Verbose = V_NOFLAG;
@@ -4027,10 +4029,10 @@
===================================================================
RCS file: /cvs/tools/dmake/function.c,v
retrieving revision 1.7
-retrieving revision 1.7.6.4
-diff -u -p -r1.7 -r1.7.6.4
+retrieving revision 1.7.6.5
+diff -u -p -r1.7 -r1.7.6.5
--- openoffice.org.orig/dmake/function.c 8 Sep 2004 16:06:20 -0000 1.7
-+++ openoffice.org/dmake/function.c 4 Sep 2005 19:38:14 -0000 1.7.6.4
++++ openoffice.org/dmake/function.c 5 Sep 2005 17:23:44 -0000 1.7.6.5
@@ -58,23 +58,48 @@ char *buf;
char *args;
char *mod1;
@@ -4177,7 +4179,7 @@
static FILE *tmp;
int wait = Wait_for_completion;
-+ int old_is_shell_exec = Is_shell_exec;
++ CELLPTR old_Shell_exec_target = Shell_exec_target;
uint16 vflag = Verbose;
int tflag = Trace;
char *res = NIL(char);
@@ -4197,29 +4199,34 @@
if( nestlevel == 0 ) {
org_out = dup(1);
-@@ -520,7 +575,13 @@ char *mod1;
+@@ -520,7 +575,18 @@ char *mod1;
buffer = MALLOC(bsize,char);
}
+ /* As this function redirects the output of stdout we have to make sure
-+ * that only this single command is executed. With Is_shell_exec and
-+ * Wait_for_completion set this is realized. This is obviously a design
-+ * weakness, if the client process would do the redirection the additional
-+ * global variable would not be needed. */
++ * that only this single command is executed and all previous recipe lines
++ * that belong to the same target have finished. With Shell_exec_target and
++ * Wait_for_completion set this is realized. Current_target being NIL(CELL)
++ * outside of recipe lines makes sure that no waiting for previous recipe
++ * lines has to be done.
++ * It is obviously a design weakness that the parent process redirects stdout.
++ * If the client process would do the redirection and the shell escape would
++ * be handled as an additional recipe line no extra waiting for finishing would
++ * have to be done. */
Wait_for_completion = TRUE;
-+ Is_shell_exec = TRUE;
++ Shell_exec_target = Current_target;
Verbose &= V_LEAVE_TMP;
Trace = FALSE;
nestlevel++;
-@@ -530,6 +591,7 @@ char *mod1;
+@@ -530,6 +596,7 @@ char *mod1;
Trace = tflag;
Verbose = vflag;
Wait_for_completion = wait;
-+ Is_shell_exec = old_is_shell_exec;
++ Shell_exec_target = old_Shell_exec_target;
/* Now we have to read the temporary file, get the tokens and return them
* as a string. */
-@@ -541,6 +603,9 @@ char *mod1;
+@@ -541,6 +608,9 @@ char *mod1;
res = DmStrJoin(res,buffer,-1,TRUE);
else {
*p = '\0';
@@ -4908,10 +4915,10 @@
===================================================================
RCS file: /cvs/tools/dmake/vextern.h,v
retrieving revision 1.1.1.1
-retrieving revision 1.1.1.1.132.3
-diff -u -p -r1.1.1.1 -r1.1.1.1.132.3
+retrieving revision 1.1.1.1.132.4
+diff -u -p -r1.1.1.1 -r1.1.1.1.132.4
--- openoffice.org.orig/dmake/vextern.h 22 Sep 2000 15:33:26 -0000 1.1.1.1
-+++ openoffice.org/dmake/vextern.h 4 Sep 2005 19:38:15 -0000 1.1.1.1.132.3
++++ openoffice.org/dmake/vextern.h 5 Sep 2005 17:23:45 -0000 1.1.1.1.132.4
@@ -46,10 +46,12 @@ EXTERN char* GShell; /* pointer to macr
EXTERN char* GShell_flags; /* pointer to macro value for GROUPFLAGS */
EXTERN char* Shell_metas; /* pointer to macro value for SHELLMETAS */
@@ -4932,7 +4939,7 @@
EXTERN CELLPTR Current_target; /* cell of current target being made */
-EXTERN int Wait_for_completion;
+EXTERN int Wait_for_completion; /* Wait for subprocess to finish */
-+EXTERN int Is_shell_exec; /* Enable special child process handling */
++EXTERN CELLPTR Shell_exec_target; /* Keep Current_target for _shell_exec */
EXTERN int Doing_bang;
EXTERN int Packed_shell; /* TRUE if packed args to use a shell */
EXTERN int Swap_on_exec; /* TRUE if going to swap on exec call */
@@ -9809,10 +9816,10 @@
===================================================================
RCS file: /cvs/tools/dmake/unix/runargv.c,v
retrieving revision 1.8
-retrieving revision 1.8.6.1
-diff -u -p -r1.8 -r1.8.6.1
+retrieving revision 1.8.6.2
+diff -u -p -r1.8 -r1.8.6.2
--- openoffice.org.orig/dmake/unix/runargv.c 8 Sep 2004 16:09:39 -0000 1.8
-+++ openoffice.org/dmake/unix/runargv.c 4 Sep 2005 19:38:15 -0000 1.8.6.1
++++ openoffice.org/dmake/unix/runargv.c 5 Sep 2005 17:23:46 -0000 1.8.6.2
@@ -24,6 +24,47 @@
-- LOG
-- Use cvs log to obtain detailed change logs.
@@ -9851,7 +9858,7 @@
+ If pid = -1 wait for the next child process to finish.
+ If Wait_for_completion is set handle all finished processes until the
+ process with the given pid is reached.
-+ If Is_shell_exec (global variable) is set wait and handle only the given
++ If Shell_exec_target (global variable) is set wait and handle only the given
+ pid.
+
+_finished_child(pid, ?) [unix/runargv] removes the finished child from its
@@ -9861,12 +9868,37 @@
#include <signal.h>
#ifdef HAVE_WAIT_H
-@@ -185,7 +226,11 @@ int pid;
+@@ -113,15 +154,23 @@ int shell;
+ char *cmd;
+ {
+ int pid;
++ int st_pq = 0; /* Current _exec_shell target process queue */
+ char **argv;
+
+- if( _running(target) /*&& Max_proc != 1*/ ) {
++ if( _running(target) != -1 /*&& Max_proc != 1*/ ) {
+ /* The command will be executed when the previous recipe
+ * line completes. */
+ _attach_cmd( cmd, group, ignore, target, last, shell );
+ return(1);
+ }
+
++ /* Special handling for the shell function macro is required. If the currend
++ * command is called as part of a shell escape in a recipe make sure that all
++ * previous recipe lines of this target have finished. */
++ if( Shell_exec_target && (st_pq = _running(Shell_exec_target)) != -1 ) {
++ Wait_for_child(FALSE, _procs[st_pq].pr_pid);
++ }
++
+ /* Any Fatal call can potentially loop by recursion because we
+ * are called from the Quit routine that Fatal indirectly calls
+ * since Fatal should not happen I have left this bug in here */
+@@ -185,7 +234,11 @@ int pid;
waitchild = (pid == -1)? FALSE : Wait_for_completion;
do {
- wid = wait(&status);
-+ if( Is_shell_exec ) /* For pid == -1 waitpid behaves like wait. */
++ if( Shell_exec_target ) /* For pid == -1 waitpid behaves like wait. */
+ wid = waitpid(pid, &status, 0);
+ else
+ wid = wait(&status);
@@ -9874,6 +9906,23 @@
if( wid == -1 )
return(-1);
+@@ -319,14 +372,14 @@ CELLPTR cp;
+ {
+ register int i;
+
+- if( !_procs ) return(FALSE);
++ if( !_procs ) return( -1 );
+
+ for( i=0; i<Max_proc; i++ )
+ if( _procs[i].pr_valid &&
+ _procs[i].pr_target == cp )
+ break;
+
+- return( i != Max_proc );
++ return( i == Max_proc ? -1 : i );
+ }
+
+
Index: win95/Makefile.in
===================================================================
RCS file: /cvs/tools/dmake/win95/Makefile.in,v
More information about the fedora-cvs-commits
mailing list