To comment on the following update, log in, then open the issue:
http://www.openoffice.org/issues/show_bug.cgi?id=43254
Issue #:|43254
Summary:|[PATCH] Don't import OS from environment on Win32
Component:|tools
Version:|current
Platform:|PC
URL:|
OS/Version:|Windows XP
Status:|UNCONFIRMED
Status whiteboard:|
Keywords:|
Resolution:|
Issue type:|PATCH
Priority:|P3
Subcomponent:|dmake
Assigned to:|hjs
Reported by:|shay
------- Additional comments from [EMAIL PROTECTED] Mon Feb 21 05:12:57 -0800
2005 -------
On my Windows XP machine, I find that the OS itself sets an environment variable
called "OS" to the value "Windows_NT".
This interferes with the smooth operation of dmake.exe since I need to have OS
set to "win95" (having built it via "make win95-vpp40"). It is annoying to have
to clear OS, or change it to "win95", and I would prefer it if dmake.exe didn't
import this setting from the environment.
The patch below makes this change.
An alternative might be to change win95/microsft/vpp40/template.mk (which gets
copied to startup/config.mk) so that it contains "OS = win95" rather than "OS *=
win95", i.e. clobber the OS's setting with our own. I don't know what your
preference is, but it would be great if one or the other change could be
applied.
diff -ruN dmake.orig/startup/startup.mk dmake/startup/startup.mk
--- dmake.orig/startup/startup.mk 2000-09-22 16:33:32.000000000 +0100
+++ dmake/startup/startup.mk 2005-02-21 13:03:37.944096700 +0000
@@ -24,7 +24,9 @@
__.EXECS !:= yes # yes => define how to build executables.
# Grab key definitions from the environment
-.IMPORT .IGNORE : OS OSRELEASE OSENVIRONMENT TMPDIR SHELL
+# OS is set by default on some Win32 OS's (including XP) to a long name, so
+# we let config.mk provide the default
+.IMPORT .IGNORE : OSRELEASE OSENVIRONMENT TMPDIR SHELL
# Default DMAKE configuration, if not overriden by environment
.INCLUDE .NOINFER $(!null,$(OS) .IGNORE) : $(INCFILENAME:d)config.mk
diff -ruN dmake.orig/win95/microsft/ruletab.c dmake/win95/microsft/ruletab.c
--- dmake.orig/win95/microsft/ruletab.c 2003-03-25 14:02:54.000000000 +0000
+++ dmake/win95/microsft/ruletab.c 2005-02-21 13:04:09.927857600 +0000
@@ -35,7 +35,7 @@
"MAXLINELENGTH := 2046",
"MAXPROCESSLIMIT := 4",
"MAXPROCESS := 1",
- ".IMPORT .IGNORE: DMAKEROOT SOLARVER UPD INPATH OS UPDMINOREXT",
+ ".IMPORT .IGNORE: DMAKEROOT SOLARVER UPD INPATH UPDMINOREXT",
".MAKEFILES : makefile.mk makefile",
".SOURCE : .NULL",
#include "startup.h"
---------------------------------------------------------------------
Please do not reply to this automatically generated notification from
Issue Tracker. Please log onto the website and enter your comments.
http://qa.openoffice.org/issue_handling/project_issues.html#notification
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
