[Libreoffice-commits] .: autodoc/source avmedia/Library_avmediagst_0_10.mk avmedia/Library_avmediagst.mk basic/CppunitTest_basic_coverage.mk basic/CppunitTest_basic_enable.mk basic/CppunitTest_basic_nested_struct.mk basic/CppunitTest_basic_scanner.mk basic/Library_sb.mk bean/Library_officebean.mk bean/test bootstrap bridges/Library_java_uno.mk bridges/test cairo/cairo cairo/pixman canvas/workben connectivity/Library_postgresql-sdbc-impl.mk connectivity/Module_connectivity.mk cppuhelper/test cui/Library_cui.mk curl/ExternalPackage_curl.mk curl/ExternalProject_curl.mk dbaccess/Library_dbu.mk dbaccess/Module_dbaccess.mk desktop/Executable_oosplash.mk desktop/Library_sofficeapp.mk dtrans/Library_mcnttype.mk extensions/Executable_nsplugin.mk extensions/Library_npsoplugin.mk extensions/Library_pl.mk extensions/Library_scn.mk extensions/Module_extensions.mk extensions/qa extensions/StaticLibrary_plugcon.mk external/Module_external.mk helpcompiler/source hunspell/ExternalProject_hunspell.mk icu/m akefile.mk instsetoo_native/inc_openoffice instsetoo_native/util jvmfwk/Library_sunjavaplugin.mk jvmfwk/Package_rcfiles.mk liblangtag/ExternalPackage_langtag.mk liblangtag/ExternalProject_langtag.mk liblangtag/UnpackedTarball_langtag.mk libxslt/makefile.mk lpsolve/ExternalPackage_lpsolve.mk lpsolve/ExternalProject_lpsolve.mk lpsolve/lp_solve_5.5.patch lpsolve/UnpackedTarball_lpsolve.mk mysqlcppconn/mysql_config.pmk mysqlcppconn/mysql-connector-c++-1.1.0.patch mysqlc/source nss/makefile.mk odk/pack odk/util pyuno/CustomTarget_zipcore.mk pyuno/Library_pyuno_wrapper.mk pyuno/Module_pyuno.mk pyuno/Package_python_scripts.mk readlicense_oo/CustomTarget_readme.mk readlicense_oo/Package_readme.mk redland/raptor redland/rasqal redland/redland registry/workben RepositoryExternal.mk rsc/Executable_rsc.mk sal/Library_sal.mk sal/qa sal/test sal/workben sane/Module_sane.mk scp2/InstallModule_javafilter.mk scp2/InstallModule_ooo.mk scp2/InstallModule_python.mk scp2/InstallScript_setup_osl. mk scp2/Module_scp2.mk sc/workben sd/Library_sd.mk sd/Library_sdui.mk sd/workben setup_native/source shell/Module_shell.mk solenv/bin solenv/inc solenv/Module_solenv.mk soltools/Module_soltools.mk stoc/test store/workben svl/CppunitTest_svl_lngmisc.mk svtools/Module_svtools.mk svx/Library_svxcore.mk sysui/desktop sysui/util testtools/qa testtools/source tools/Library_tl.mk ucb/workben writerfilter/qa xmerge/Package_xmergesync.mk xmerge/source xmlhelp/Library_ucpchelp1.mk xmlhelp/source xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/tools xpdf/makefile.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 25 09:53:46 PST 2012
RepositoryExternal.mk | 8
autodoc/source/exes/adc_uni/makefile.mk | 2
avmedia/Library_avmediagst.mk | 2
avmedia/Library_avmediagst_0_10.mk | 2
basic/CppunitTest_basic_coverage.mk | 2
basic/CppunitTest_basic_enable.mk | 2
basic/CppunitTest_basic_nested_struct.mk | 2
basic/CppunitTest_basic_scanner.mk | 2
basic/Library_sb.mk | 10
bean/Library_officebean.mk | 4
bean/test/applet/oooapplet/makefile.mk | 2
bootstrap | 4
bridges/Library_java_uno.mk | 2
bridges/test/java_uno/acquire/makefile.mk | 2
bridges/test/java_uno/any/makefile.mk | 2
bridges/test/java_uno/equals/makefile.mk | 2
bridges/test/java_uno/nativethreadpool/makefile.mk | 4
cairo/cairo/makefile.mk | 2
cairo/pixman/makefile.mk | 2
canvas/workben/makefile.mk | 2
connectivity/Library_postgresql-sdbc-impl.mk | 2
connectivity/Module_connectivity.mk | 6
cppuhelper/test/bootstrap/makefile.mk | 2
cppuhelper/test/loader/makefile.mk | 2
cppuhelper/test/makefile.mk | 4
cppuhelper/test/testcmp/makefile.mk | 2
cppuhelper/test/testdefaultbootstrapping.pl | 8
cppuhelper/test/testlib/makefile.mk | 4
cui/Library_cui.mk | 4
curl/ExternalPackage_curl.mk | 2
curl/ExternalProject_curl.mk | 2
dbaccess/Library_dbu.mk | 6
dbaccess/Module_dbaccess.mk | 2
desktop/Executable_oosplash.mk | 2
desktop/Library_sofficeapp.mk | 2
dtrans/Library_mcnttype.mk | 2
extensions/Executable_nsplugin.mk | 2
extensions/Library_npsoplugin.mk | 2
extensions/Library_pl.mk | 4
extensions/Library_scn.mk | 4
extensions/Module_extensions.mk | 2
extensions/StaticLibrary_plugcon.mk | 2
extensions/qa/complex/extensions/makefile.mk | 2
external/Module_external.mk | 2
helpcompiler/source/HelpCompiler.cxx | 1
hunspell/ExternalProject_hunspell.mk | 2
icu/makefile.mk | 8
instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk | 2
instsetoo_native/util/makefile.mk | 22
jvmfwk/Library_sunjavaplugin.mk | 2
jvmfwk/Package_rcfiles.mk | 6
liblangtag/ExternalPackage_langtag.mk | 2
liblangtag/ExternalProject_langtag.mk | 2
liblangtag/UnpackedTarball_langtag.mk | 2
libxslt/makefile.mk | 2
lpsolve/ExternalPackage_lpsolve.mk | 11
lpsolve/ExternalProject_lpsolve.mk | 8
lpsolve/UnpackedTarball_lpsolve.mk | 2
lpsolve/lp_solve_5.5.patch | 2
mysqlc/source/makefile.mk | 4
mysqlcppconn/mysql-connector-c++-1.1.0.patch | 4
mysqlcppconn/mysql_config.pmk | 4
nss/makefile.mk | 8
odk/pack/copying/makefile.mk | 12
odk/util/makefile.pmk | 4
pyuno/CustomTarget_zipcore.mk | 2
pyuno/Library_pyuno_wrapper.mk | 2
pyuno/Module_pyuno.mk | 2
pyuno/Package_python_scripts.mk | 2
readlicense_oo/CustomTarget_readme.mk | 4
readlicense_oo/Package_readme.mk | 2
redland/raptor/makefile.mk | 2
redland/rasqal/makefile.mk | 2
redland/redland/makefile.mk | 2
registry/workben/makefile.mk | 4
rsc/Executable_rsc.mk | 2
sal/Library_sal.mk | 8
sal/qa/buildall.pl | 11
sal/qa/osl/socket/osl_AcceptorSocket.cxx | 4
sal/qa/osl/socket/osl_ConnectorSocket.cxx | 4
sal/qa/osl/socket/osl_DatagramSocket.cxx | 4
sal/qa/osl/socket/osl_Socket.cxx | 4
sal/qa/osl/socket/osl_Socket2.cxx | 4
sal/qa/osl/socket/osl_SocketAddr.cxx | 4
sal/qa/osl/socket/osl_StreamSocket.cxx | 4
sal/test/bootstrap.pl | 16
sal/test/makefile.mk | 6
sal/workben/makefile.mk | 10
sane/Module_sane.mk | 2
sc/workben/makefile.mk | 2
scp2/InstallModule_javafilter.mk | 2
scp2/InstallModule_ooo.mk | 2
scp2/InstallModule_python.mk | 2
scp2/InstallScript_setup_osl.mk | 2
scp2/Module_scp2.mk | 2
sd/Library_sd.mk | 2
sd/Library_sdui.mk | 2
sd/workben/testdll/makefile | 2
setup_native/source/win32/customactions/indexingfilter/makefile.mk | 2
setup_native/source/win32/customactions/javafilter/makefile.mk | 2
setup_native/source/win32/customactions/languagepacks/makefile.mk | 2
setup_native/source/win32/customactions/patch/makefile.mk | 2
setup_native/source/win32/customactions/quickstarter/makefile.mk | 2
setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk | 2
setup_native/source/win32/customactions/regactivex/makefile.mk | 2
setup_native/source/win32/customactions/regpatchactivex/makefile.mk | 2
setup_native/source/win32/customactions/sellang/makefile.mk | 2
setup_native/source/win32/customactions/shellextensions/makefile.mk | 2
setup_native/source/win32/customactions/thesaurus/makefile.mk | 2
setup_native/source/win32/customactions/tools/makefile.mk | 2
shell/Module_shell.mk | 2
solenv/Module_solenv.mk | 2
solenv/bin/build.pl | 24
solenv/bin/deliver.pl | 8
solenv/bin/modules/installer/control.pm | 2
solenv/bin/modules/installer/environment.pm | 5
solenv/bin/ooinstall | 2
solenv/inc/_tg_app.mk | 120 +--
solenv/inc/_tg_def.mk | 100 +-
solenv/inc/_tg_lib.mk | 220 +++---
solenv/inc/_tg_rslb.mk | 60 -
solenv/inc/_tg_shl.mk | 360 +++++-----
solenv/inc/_tg_zip.mk | 20
solenv/inc/extension_post.mk | 6
solenv/inc/extension_pre.mk | 2
solenv/inc/lang.mk | 10
solenv/inc/libs.mk | 38 -
solenv/inc/pstrules.mk | 14
solenv/inc/rules.mk | 44 -
solenv/inc/settings.mk | 24
solenv/inc/target.mk | 62 -
solenv/inc/tg_app.mk | 12
solenv/inc/tg_config.mk | 2
solenv/inc/tg_def.mk | 10
solenv/inc/tg_ext.mk | 60 -
solenv/inc/tg_java.mk | 6
solenv/inc/tg_lib.mk | 22
solenv/inc/tg_moz.mk | 2
solenv/inc/tg_obj.mk | 16
solenv/inc/tg_rslb.mk | 6
solenv/inc/tg_shl.mk | 36 -
solenv/inc/tg_slo.mk | 16
solenv/inc/tg_zip.mk | 2
solenv/inc/unitools.mk | 6
solenv/inc/unx.mk | 2
solenv/inc/wnt.mk | 2
soltools/Module_soltools.mk | 4
stoc/test/makefile.mk | 6
stoc/test/security/makefile.mk | 2
store/workben/makefile.mk | 8
svl/CppunitTest_svl_lngmisc.mk | 2
svtools/Module_svtools.mk | 2
svx/Library_svxcore.mk | 2
sysui/desktop/share/makefile.mk | 4
sysui/util/checksize.pl | 2
testtools/qa/cli/makefile.mk | 2
testtools/source/bridgetest/pyuno/makefile.mk | 12
tools/Library_tl.mk | 2
ucb/workben/ucb/makefile.mk | 4
writerfilter/qa/cppunittests/odiapi/makefile.mk | 4
writerfilter/qa/cppunittests/qname/makefile.mk | 6
xmerge/Package_xmergesync.mk | 2
xmerge/source/activesync/makefile.mk | 4
xmerge/source/regutil/makefile.mk | 2
xmlhelp/Library_ucpchelp1.mk | 2
xmlhelp/source/cxxhelp/test/makefile.mk | 2
xmlsecurity/Library_xsec_xmlsec.mk | 6
xmlsecurity/tools/standalone/csfit/makefile.mk | 2
xmlsecurity/tools/standalone/csfit/util/makefile.mk | 18
xmlsecurity/tools/standalone/mscsfit/makefile.mk | 2
xmlsecurity/tools/standalone/mscsfit/util/makefile.mk | 18
xpdf/makefile.mk | 4
172 files changed, 916 insertions(+), 924 deletions(-)
New commits:
commit c29098917a1118d4b435df2b5f542adc8505e123
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Dec 12 01:07:09 2012 +0200
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.
Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2 at verizon.net>
Tested-by: Peter Foley <pefoley2 at verizon.net>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 015eb88..7798c79 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -126,7 +126,7 @@ endef
endif
-ifeq (SANEUNX,$(filter SANE,$(BUILD_TYPE))$(GUI))
+ifeq (SANE,$(filter SANE,$(BUILD_TYPE))$(filter WNT,$(OS)))
define gb_LinkTarget__use_sane_headers
$(call gb_Library_use_packages,$(1),\
@@ -1724,7 +1724,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
$(if $(filter MSC,$(COM)),lib)pq \
)
-ifeq ($(GUI)$(COM),WNTMSC)
+ifeq ($(OS)$(COM),WNTMSC)
$(call gb_LinkTarget_use_external,$(1),openssl)
$(call gb_LinkTarget_use_system_win32_libs,$(1),\
@@ -1775,7 +1775,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
mozreg_s \
)
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(call gb_LinkTarget_add_defs,$(1),\
-DMOZILLA_CLIENT \
@@ -1818,7 +1818,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endif # !GCC
-else ifeq ($(GUI),UNX)
+else
$(call gb_LinkTarget_add_defs,$(1),\
-DMOZILLA_CLIENT \
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index d24b1ce..2cb3980 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -65,7 +65,7 @@ APP1OBJS= $(OBJ)$/main.obj
APP1RPATH=SDKBIN
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
APP1STDLIBS= $(COSVLIB) $(UDMLIB)
.ELSE
.IF "$(OS)"=="MACOSX"
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 8bb8561..1e0b5fc 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_LIBS)))
$(eval $(call gb_Library_use_sdk_api,avmediagst))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_defs,avmediagst,\
-DWINNT
))
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
index 18387a9..91ce2fa 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,avmediagst_0_10,\
$(eval $(call gb_Library_use_sdk_api,avmediagst_0_10))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_defs,avmediagst_0_10,\
-DWINNT
))
diff --git a/basic/CppunitTest_basic_coverage.mk b/basic/CppunitTest_basic_coverage.mk
index e1189e5..1d337b5 100644
--- a/basic/CppunitTest_basic_coverage.mk
+++ b/basic/CppunitTest_basic_coverage.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_coverage, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_coverage, \
oleaut32 \
))
diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk
index 5f6587d..7a1c3da 100644
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \
oleaut32 \
))
diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk
index 268f29a..f7db5a1 100644
--- a/basic/CppunitTest_basic_nested_struct.mk
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \
oleaut32 \
))
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index b5eccfa..bd566af 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \
oleaut32 \
))
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 16bb39e..8597b21 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -138,18 +138,18 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
canvastools \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,sb,\
oleaut32 \
))
endif
-ifeq ($(GUI)$(CPUNAME),WNTINTEL)
+ifeq ($(OS)$(CPUNAME),WNTINTEL)
$(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x86 \
))
else
-ifeq ($(GUI)$(CPUNAME),WNTX86_64)
+ifeq ($(OS)$(CPUNAME),WNTX86_64)
$(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x64 \
))
@@ -159,12 +159,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
))
endif
endif
-ifeq ($(GUI)$(COM)$(CPUNAME),WNTMSCINTEL)
+ifeq ($(OS)$(COM)$(CPUNAME),WNTMSCINTEL)
$(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-x86 \
))
endif
-ifeq ($(GUI)$(COM)$(CPUNAME),WNTGCCINTEL)
+ifeq ($(OS)$(COM)$(CPUNAME),WNTGCCINTEL)
$(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-mingw \
))
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 2229e62..160d9c6 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -30,7 +30,7 @@
$(eval $(call gb_Library_Library,officebean))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Library_use_packages,officebean,\
sal_generated \
sal_inc \
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_cobjects,officebean,\
))
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_cobjects,officebean,\
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow \
bean/native/win32/com_sun_star_beans_LocalOfficeWindow \
diff --git a/bean/test/applet/oooapplet/makefile.mk b/bean/test/applet/oooapplet/makefile.mk
index edb68ff..89c915a 100644
--- a/bean/test/applet/oooapplet/makefile.mk
+++ b/bean/test/applet/oooapplet/makefile.mk
@@ -52,7 +52,7 @@ COPY_FILES: example.html
# --- Targets ------------------------------------------------------
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
RUN:
firefox "$(CLASSDIR)$/example.html?$(office)"
.ELSE
diff --git a/bootstrap b/bootstrap
index b7a7362..38ebb4e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -20,7 +20,7 @@ fi
# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
# Use spawn instead of fork when building dmake on cygwin.
-if test "$GUI_FOR_BUILD" = "WNT"; then
+if test "$OS_FOR_BUILD" = "WNT"; then
EXEEXT=".exe"
DMAKE_CONF="--enable-spawn"
else
@@ -37,7 +37,7 @@ if test "$BUILD_DMAKE" != "NO"; then
cd "$SRC_ROOT/dmake" || exit
# If cross-compiling then don't use the cross compilers to build dmake.
- if test "$GUI_FOR_BUILD" = "WNT"; then
+ if test "$OS_FOR_BUILD" = "WNT"; then
# Let the Cygwin gcc be found
unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
elif test "$CROSS_COMPILING" = "YES"; then
diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk
index d9b8112..178a008 100644
--- a/bridges/Library_java_uno.mk
+++ b/bridges/Library_java_uno.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Library_Library,java_uno))
-ifeq ($(GUI)$(COM),WNTGCC)
+ifeq ($(OS)$(COM),WNTGCC)
ifeq ($(EXCEPTIONS),sjlj)
$(eval $(call gb_Library_add_defs,java_uno,\
-DBROKEN_ALLOCA \
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index 89f120e..e7da44f 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -48,7 +48,7 @@ ALLTAR: \
$(BIN)$/testacquire-native-client \
$(BIN)$/testacquire-native-server
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
GIVE_EXEC_RIGHTS = @echo
.ELSE # GUI, WNT
GIVE_EXEC_RIGHTS = chmod +x
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index f29550a..549ea76 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -26,7 +26,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
GIVE_EXEC_RIGHTS = @echo
.ELSE
GIVE_EXEC_RIGHTS = chmod +x
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index fc6ad34..a49dea6 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -51,7 +51,7 @@ JARFILES = juh.jar jurt.jar ridl.jar
ALLTAR: $(BIN)$/testequals
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
GIVE_EXEC_RIGHTS = @echo
.ELSE # GUI, WNT
GIVE_EXEC_RIGHTS = chmod +x
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index 97eee2b..0d46ddb 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -88,7 +88,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
$(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
-c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
-c stocservices.uno$(DLLPOST)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
ERROR -- missing platform
.ELSE # GUI, WNT
+ export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \
@@ -98,7 +98,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
.ENDIF # GUI, WNT
test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
ERROR -- missing platform
.ELSE # GUI, WNT
$(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 5e40c8c..99ddb9e 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -98,7 +98,7 @@ CONFIGURE_FLAGS=--disable-valgrind --disable-xlib --disable-ft --disable-pthread
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)$/src
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
.EXPORT : PWD
.ENDIF
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 10ba0f5..cab9d7d 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -68,7 +68,7 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 -
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
.EXPORT : PWD
.ENDIF
diff --git a/canvas/workben/makefile.mk b/canvas/workben/makefile.mk
index fb217cf..e3e017d 100644
--- a/canvas/workben/makefile.mk
+++ b/canvas/workben/makefile.mk
@@ -46,7 +46,7 @@ APP1STDLIBS=$(TOOLSLIB) \
$(VCLLIB) \
$(BASEGFXLIB)
-.IF "$(GUI)"!="UNX"
+.IF "$(OS)"=="WNT"
APP1DEF= $(MISC)$/$(TARGET).def
.ENDIF
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 8fbb372..a69e3d8 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
))
ifneq ($(SYSTEM_POSTGRESQL),YES)
-ifneq ($(GUI)$(COM),WNTMSC)
+ifneq ($(OS)$(COM),WNTMSC)
-include $(OUTDIR)/inc/postgresql/libpq-flags.mk
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 26dd647..0b5b22c 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -64,7 +64,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifeq ($(ENABLE_KAB),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
@@ -92,7 +92,7 @@ endif
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_ado \
Library_ado \
@@ -145,7 +145,7 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_ado \
))
diff --git a/cppuhelper/test/bootstrap/makefile.mk b/cppuhelper/test/bootstrap/makefile.mk
index 6f185bf..a2d1715 100644
--- a/cppuhelper/test/bootstrap/makefile.mk
+++ b/cppuhelper/test/bootstrap/makefile.mk
@@ -28,7 +28,7 @@ USE_DEFFILE := TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
PURPENVHELPERLIB := -luno_purpenvhelper$(COMID)
.ELSE
diff --git a/cppuhelper/test/loader/makefile.mk b/cppuhelper/test/loader/makefile.mk
index 32e541b..73bf2ab 100644
--- a/cppuhelper/test/loader/makefile.mk
+++ b/cppuhelper/test/loader/makefile.mk
@@ -30,7 +30,7 @@ ENVINCPRE := -I$(OUT)$/inc$/$(TARGET)
APP1TARGET := $(TARGET)
APP1OBJS := $(OBJ)$/loader.test.obj
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
APP1STDLIBS := iTestComponent.uno.lib
.ELSE
APP1STDLIBS := -lTestComponent.uno
diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk
index 6d80a52..7ff0310 100644
--- a/cppuhelper/test/makefile.mk
+++ b/cppuhelper/test/makefile.mk
@@ -85,7 +85,7 @@ ALL: $(BIN)$/cpputest.rdb \
$(BIN)$/$(APP2TARGET).Bin \
$(BIN)$/$(APP2TARGET).Exe
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
ALL: $(BIN)$/$(APP2TARGET).exe
$(BIN)$/$(APP2TARGET).exe : $(APP2TARGETN)
@@ -147,7 +147,7 @@ $(BIN)$/testdefaultbootstrapping.pl: testdefaultbootstrapping.pl
cp testdefaultbootstrapping.pl $@
$(BIN)$/testrc: makefile.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
echo [Tests] > $@
echo TestKey1=com.sun.star.uno.NamingService.rdb >> $@
.ELSE
diff --git a/cppuhelper/test/testcmp/makefile.mk b/cppuhelper/test/testcmp/makefile.mk
index ef4c3f9..a59657e 100644
--- a/cppuhelper/test/testcmp/makefile.mk
+++ b/cppuhelper/test/testcmp/makefile.mk
@@ -29,7 +29,7 @@ SHL1TARGET := $(TARGET)
SHL1OBJS := $(SLO)$/TestComponent.obj
SHL1STDLIBS := $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
SHL1IMPLIB := i$(SHL1TARGET)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
SHL1DEF := TestComponent.uno.def
.ELSE
DEF1NAME := $(SHL1TARGET)
diff --git a/cppuhelper/test/testdefaultbootstrapping.pl b/cppuhelper/test/testdefaultbootstrapping.pl
index f884044..278e759 100644
--- a/cppuhelper/test/testdefaultbootstrapping.pl
+++ b/cppuhelper/test/testdefaultbootstrapping.pl
@@ -26,7 +26,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
my $progname = "testdefaultbootstrapping";
my $defExeExt;
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
%services = (
'com.sun.star.uno.NamingService' => 'namingservice.uno.dll',
'com.sun.star.reflection.CoreReflection' => 'reflection.uno.dll',
@@ -50,7 +50,7 @@ sub extendProgName($) {
my $_extension = shift;
my $_result;
- if ($ENV{GUI} eq "WNT") {
+ if ($ENV{OS} eq "WNT") {
$_result = $progname . $_extension;
}
else {
@@ -183,7 +183,7 @@ sub testBeneathLib_rdb() {
my $_rdb_name;
- if ($ENV{GUI} eq "WNT") {
+ if ($ENV{OS} eq "WNT") {
$_rdb_name = "UNO" . "_services.rdb";
}
else {
@@ -206,7 +206,7 @@ sub testBeneathLib_rc() {
my $_rc_name;
- if ($ENV{GUI} eq "WNT") {
+ if ($ENV{OS} eq "WNT") {
$_rc_name = "UNO.ini";
}
else {
diff --git a/cppuhelper/test/testlib/makefile.mk b/cppuhelper/test/testlib/makefile.mk
index 2683093..cbf30f0 100644
--- a/cppuhelper/test/testlib/makefile.mk
+++ b/cppuhelper/test/testlib/makefile.mk
@@ -38,7 +38,7 @@ PERLINCS:=$(PERLINST)$/CORE
CFLAGS += -I$(PERLINCS)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
PERLLIB=perl58.lib
LIB!:=$(LIB);$(PERLLIBS)
@@ -67,7 +67,7 @@ DEF1NAME=$(SHL1TARGET)
SHL1VERSIONMAP=defbootstrap.map
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
UNODLL=$(DLLDEST)$/UNO.dll
.ELSE
UNODLL=$(DLLDEST)$/UNO.so
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 404e72f..2d21cfc 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_externals,cui,\
icuuc \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,cui,\
advapi32 \
shlwapi \
@@ -207,7 +207,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/uno/services \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/winpluginlib \
))
diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk
index b91a8ee..495b4f9 100644
--- a/curl/ExternalPackage_curl.mk
+++ b/curl/ExternalPackage_curl.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl))
$(eval $(call gb_ExternalPackage_use_external_project,curl,curl))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/pkgconfig/libcurl.pc,libcurl.pc))
diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk
index e1388cd..c1c9219 100644
--- a/curl/ExternalProject_curl.mk
+++ b/curl/ExternalProject_curl.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
build \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR) \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 9bfe58b..ba95c73 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,dbu,\
-DDBACCESS_DLLIMPLEMENTATION \
))
-ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h
+ifeq ($(OS)$(COM),WNTGCC) # for adoint.h
$(eval $(call gb_Library_add_cxxflags,dbu,\
-fpermissive \
))
@@ -74,7 +74,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,dbu,\
ole32 \
oleaut32 \
@@ -268,7 +268,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/uno/UserSettingsDlg \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/dlg/adodatalinks \
))
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index f087ba8..3195bbf 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
AllLangResTarget_dbmm \
AllLangResTarget_dbu \
AllLangResTarget_sdbt \
- $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \
+ $(if $(filter WNT,$(OS)),Executable_odbcconfig) \
Library_dba \
Library_dbaxml \
Library_dbmm \
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 3fa96d4..b67e08d 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Executable_add_libs,oosplash,\
endif
ifneq ($(GUIBASE),headless)
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Executable_add_libs,oosplash,\
-lX11 \
))
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 9f4b6da..e37db8f 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_sdk_api,sofficeapp))
$(eval $(call gb_Library_add_defs,sofficeapp,\
-DDESKTOP_DLLIMPLEMENTATION \
$(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \
- $(if $(filter WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \
+ $(if $(filter WNT,$(OS)),-DENABLE_QUICKSTART_APPLET) \
$(if $(filter MACOSX,$(OS)),-DENABLE_QUICKSTART_APPLET) \
$(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
))
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index 167f2a1..b826a42 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_exception_objects,mcnttype,\
dtrans/source/cnttype/mctfentry \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_libraries,mcnttype,\
uwinapi \
))
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 866257e..bbfb56f 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Executable_use_libraries,nsplugin,\
sal \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Executable_add_exception_objects,nsplugin,\
extensions/source/nsplugin/source/nsp_windows \
))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 7695e9d..63ee754 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
nputils \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_libs,npsoplugin,\
-ldl \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index a5b1f70..92e707f 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_libs,pl,\
))
endif # OS=SOLARIS
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,pl,\
advapi32 \
ole32 \
@@ -75,7 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,pl,\
))
endif # GUI=WNT
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifeq ($(OS),MACOSX)
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index ac173bf..d64c16d 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -52,14 +52,14 @@ $(eval $(call gb_Library_add_exception_objects,scn,\
extensions/source/scanner/scanner \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_packages,scn,twain_inc))
$(eval $(call gb_Library_add_exception_objects,scn,\
extensions/source/scanner/scanwin \
))
else
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,scn,\
extensions/source/scanner/grid \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 4912721..4c83159 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -109,7 +109,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
Library_pl \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifneq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,extensions,\
StaticLibrary_plugcon \
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index ba94b0b..bb073e7 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-ifneq ($(GUI),UNX)
+ifeq ($(OS),WNT)
$(error only for UNX)
endif
diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk
index 344ecc3..ce35151 100644
--- a/extensions/qa/complex/extensions/makefile.mk
+++ b/extensions/qa/complex/extensions/makefile.mk
@@ -37,7 +37,7 @@ EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
.ELSE
command_seperator=;
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 151ecdd..4fd7fb3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,external))
$(eval $(call gb_Module_add_targets,external,\
))
-ifeq ($(GUI)$(COM),WNTGCC)
+ifeq ($(OS)$(COM),WNTGCC)
$(eval $(call gb_Module_add_targets,external,\
CustomTarget_jawt \
CustomTarget_mingw_dlls \
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 17bb2b0..74b29f5 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -48,6 +48,7 @@ HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_input
char* guitmp = getenv("GUI");
if (guitmp)
{
+ // WTF?
gui = (strcmp(guitmp, "UNX") ? gui : "UNIX");
gui = (strcmp(guitmp, "MAC") ? gui : "MAC");
gui = (strcmp(guitmp, "WNT") ? gui : "WIN");
diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk
index aab825c..c5d89df 100644
--- a/hunspell/ExternalProject_hunspell.mk
+++ b/hunspell/ExternalProject_hunspell.mk
@@ -21,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,hunspell,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if $(filter C53,$(COM)),CFLAGS="-xc99=none") \
- $(if $(filter-out WNTGCC,$(GUI)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
+ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
&& $(MAKE) \
&& touch $@
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 5494fa5..f20d9b5 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -85,7 +85,7 @@ EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=0
# Describe it in the comment above instead.
CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) && mv icudt49l.dat data/in &&
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(SYSBASE)"!=""
icu_CFLAGS+=-I$(SYSBASE)$/usr$/include
@@ -236,7 +236,7 @@ OUT2BIN_NONE= \
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
CONFIGURE_DIR=source
.IF "$(COM)"=="GCC"
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
@@ -305,7 +305,7 @@ OUT2BIN= \
$(BUILD_DIR)$/bin$/gencmn.exe
.ENDIF
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
#make sure that when we deliver the headers of a new icu that the timestamps
#are newer than the last icu to ensure dependencies are correctly rebuilt
@@ -327,7 +327,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
.ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
ALLTAR : \
$(LB)$/icudata.lib \
$(LB)$/icuin$(ICU_BUILD_LIBPOST).lib \
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
index 30293dd..de56007 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
@@ -43,7 +43,7 @@ MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf)
.INCLUDE : target.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : $(MLFFILES)
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index e4dd09f..574ce4c 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -34,11 +34,11 @@ TARGET=util
# PERL:=@echo
# watch for the path delimiter
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.EXPORT: PYTHONPATH
ENABLE_DOWNLOADSETS*=TRUE
@@ -91,19 +91,19 @@ xxxx:
.IF "$(LIBO_DEV_INSTALL)" == "TRUE"
ALLTAR: openoffice_$(defaultlangiso).archive
.ELSE
-.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.IF "$(OS)"!="WNT" && "$(EPM)"=="NO"
ALLTAR : $(LOCALPYFILES)
@echo "No EPM: do no packaging at this stage"
-.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.ELSE # "$(OS)"!="WNT" && "$(EPM)"=="NO"
.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : openofficeall $(OOOHELPPACK)
.ELSE
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
.ENDIF
.ELSE
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : openofficeall $(OOOHELPPACK) sdkooall
.ELSE
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
@@ -111,20 +111,20 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL)
.ENDIF
.ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : openofficedevall $(OOODEVHELPPACK)
.ELSE
ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US)
.ENDIF
.ELSE
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : openofficedevall $(OOODEVHELPPACK) sdkoodevall
.ELSE
ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US
.ENDIF
.ENDIF
.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.ENDIF # "$(OS)"!="WNT" && "$(EPM)"=="NO"
.ENDIF # "$(LIBO_DEV_INSTALL)" == "TRUE"
.IF "$(MAKETARGETS:e)"!=""
@@ -316,7 +316,7 @@ openoffice:
$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
$(BIN)$/%.py : $(OUTDIR)$/lib$/pyuno$/%.py
$(COPY) $< $@
.ELSE
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index d32dc70..2d7326c 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\
))
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\
advapi32 \
))
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
index 0d4c8ac..fb5a392 100644
--- a/jvmfwk/Package_rcfiles.mk
+++ b/jvmfwk/Package_rcfiles.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk))
# The below files (intended to be also used during the build) need to go into
# the same directory as dynamic libraries (either bin or lib):
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
jvmfwk_Package_RCFILESDIR := bin
else
jvmfwk_Package_RCFILESDIR := lib
@@ -39,7 +39,7 @@ endif
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/jvmfwk3),source/jvmfwk3rc))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifeq ($(OS),FREEBSD)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))
else ifeq ($(OS),MACOSX)
@@ -51,7 +51,7 @@ $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/ja
else
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml))
endif
-else ifeq ($(GUI),WNT)
+else ifeq ($(OS),WNT)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
else
$(call gb_Output_error,Unsupported platform)
diff --git a/liblangtag/ExternalPackage_langtag.mk b/liblangtag/ExternalPackage_langtag.mk
index deb2615..3770a3e 100644
--- a/liblangtag/ExternalPackage_langtag.mk
+++ b/liblangtag/ExternalPackage_langtag.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,langtag,langtag))
$(eval $(call gb_ExternalPackage_use_external_project,langtag,langtag))
-ifeq ($(GUI)$(COM),WNTMSC)
+ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_ExternalPackage_add_file,langtag,lib/langtag.lib,liblangtag/.libs/langtag.lib))
else
$(eval $(call gb_ExternalPackage_add_file,langtag,lib/liblangtag.a,liblangtag/.libs/liblangtag.a))
diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk
index d23f5e3..ca2a650 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl,-z,origin -Wl,-rpath,$$ORIGIN:$$ORIGIN/../ure-link/lib") \
$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl,-z,origin -Wl,-R,$$ORIGIN:$$ORIGIN/../ure-link/lib") \
- $(if $(filter-out WNTGCC,$(GUI)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
+ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
&& $(MAKE) \
&& touch $@
# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk
index 663d724..f610ea3 100644
--- a/liblangtag/UnpackedTarball_langtag.mk
+++ b/liblangtag/UnpackedTarball_langtag.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
))
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
liblangtag/liblangtag-0.4.0-mingw.patch \
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 1ff05d6..1574709 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -90,7 +90,7 @@ CONFIGURE_FLAGS=--without-crypto --without-python --enable-static=no $(BUILD_AND
BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
.EXPORT : PWD
.ENDIF
.ELSE
diff --git a/lpsolve/ExternalPackage_lpsolve.mk b/lpsolve/ExternalPackage_lpsolve.mk
index ed777ab..498f9ca 100644
--- a/lpsolve/ExternalPackage_lpsolve.mk
+++ b/lpsolve/ExternalPackage_lpsolve.mk
@@ -10,16 +10,16 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
-ifneq ($(GUI_FOR_BUILD),WNT)
+ifneq ($(OS_FOR_BUILD),WNT)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dll.a))
-endif # $(GUI_FOR_BUILD)
+endif # $(OS_FOR_BUILD)
else # $(COM)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib))
endif # $(COM)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,bin,lpsolve55/lpsolve55.dll))
-else # $(GUI)
+else # $(OS)
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dylib))
@@ -31,5 +31,6 @@ $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.so
endif # $(DISABLE_DYNLOADING)
endif # $(OS)
-endif # $(GUI)
+endif # $(OS)
+
# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk
index 0b6e34e..1644b0f 100644
--- a/lpsolve/ExternalProject_lpsolve.mk
+++ b/lpsolve/ExternalProject_lpsolve.mk
@@ -15,11 +15,11 @@ $(eval $(call gb_ExternalProject_register_targets,lpsolve,\
build \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(call gb_ExternalProject_get_state_target,lpsolve,build):
cd $(EXTERNAL_WORKDIR)/lpsolve55 \
- && $(if $(filter WNT,$(GUI_FOR_BUILD)), \
+ && $(if $(filter WNT,$(OS_FOR_BUILD)), \
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)) lpsolve_LDFLAGS="-shared-libgcc") \
$(if $(filter YES,$(MINGW_SHARED_GXXLIB)) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
cmd /c cgcc.bat, sh ccc) \
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build):
&& LIB="$(ILIB)" cmd /c cvc6.bat \
&& touch $@
endif # $(COM)
-else # $(GUI)!=WNT
+else # $(OS)!=WNT
$(call gb_ExternalProject_get_state_target,lpsolve,build):
cd $(EXTERNAL_WORKDIR)/lpsolve55 \
&& sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
@@ -38,5 +38,5 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build):
$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \
ccc))) \
&& touch $@
-endif # $(GUI)
+endif # $(OS)
# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/lpsolve/UnpackedTarball_lpsolve.mk
index 2e895a0..09cb1a2 100644
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lpsolve,$(LPSOLVE_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
-ifeq ($(GUI_FOR_BUILD),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
lpsolve/lp_solve_5.5-windows.patch \
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index cea6116..7f976f0 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -19,7 +19,7 @@
+pic=
+ldflags=
+inline=
-+if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
++if [ "$OS" = "WNT" -a "$COM" = "GCC" ]; then
+ so=dll
+ a=dll.a
+ inline=-DINLINE=static
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index fee18728..63c86df 100644
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -67,7 +67,7 @@ EXTENSION_ZIPNAME:=$(EXTENSIONNAME)
.ENDIF
# use the static version
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
MYSQL_LIBDIR=$(LIBMYSQL_PATH)$/lib
MYSQL_INCDIR=$(LIBMYSQL_PATH)$/include
.ELSE
@@ -91,7 +91,7 @@ CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
.ENDIF
# --------------- MySQL settings ------------------
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
MYSQL_INC=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn -I$(MYSQL_INCDIR)
MYSQL_LIB=$(MYSQL_LIBDIR)$/libmysql.lib
MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/libmysql.dll
diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
index 9d9a8ad..eb39eb4 100644
--- a/mysqlcppconn/mysql-connector-c++-1.1.0.patch
+++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
@@ -114,7 +114,7 @@
NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
--- misc/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:34.087202551 +0200
+++ misc/build/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:25.902286382 +0200
-@@ -1 +1,64 @@
+@@ -1,1 +1,64 @@
-dummy
+PRJ=..$/..$/..$/..$/..
+
@@ -131,7 +131,7 @@
+
+# --- Files --------------------------------------------------------
+
-+.IF "$(GUI)-$(OS)-$(RTL_ARCH)" == "UNX-LINUX-x86"
++.IF "$(OS)-$(RTL_ARCH)" == "LINUX-x86"
+ SHL1NOCHECK=TRUE
+.ENDIF
+SHL1TARGET=$(TARGET)
diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk
index eb316e0..43a7ab8 100644
--- a/mysqlcppconn/mysql_config.pmk
+++ b/mysqlcppconn/mysql_config.pmk
@@ -35,11 +35,11 @@
.ENDIF
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.IF "$(SYSTEM_MYSQL)" != "YES"
MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
diff --git a/nss/makefile.mk b/nss/makefile.mk
index b1c3831..91c63d2 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -95,7 +95,7 @@ CONFIGURE_ACTION+= ; \
sed -e 's\#@prefix@\#$(OUTDIR)\#' -e 's\#@includedir@\#$(OUTDIR)/inc/mozilla/nss\#' -e 's\#@MOD_MAJOR_VERSION@\#$(VER_MAJOR)\#' -e 's\#@MOD_MINOR_VERSION@\#$(VER_MINOR)\#' -e 's\#@MOD_PATCH_VERSION@\#$(VER_PATCH)\#' mozilla/security/nss/nss-config.in > mozilla/security/nss/nss-config ; \
chmod a+x mozilla/security/nss/nss-config
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)$(COM)"=="LINUXGCC"
.IF "$(BUILD64)"=="1"
# force 64-bit buildmode
@@ -168,10 +168,10 @@ BUILD_ACTION+=NS_USE_GCC=1
BUILD_ACTION += NSS_USE_SYSTEM_SQLITE=1
.END
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
@@ -255,7 +255,7 @@ OUT2BIN=mozilla/dist/out/lib/*$(DLLPOST) \
config/nspr-config \
mozilla/security/nss/nss-config
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
OUTDIR2INC=mozilla/dist/public/nss mozilla/dist/out/include
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index ec5f172..e3421d3 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -52,12 +52,12 @@ EXELIST += \
$(DESTDIRBIN)/ucpp$(EXEPOSTFIX)
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
EXELIST += \
$(DESTDIRBIN)/climaker$(EXEPOSTFIX)
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
CLILIST = \
$(DESTDIRCLI)/cli_basetypes.dll \
$(DESTDIRCLI)/cli_uretypes.dll \
@@ -67,7 +67,7 @@ CLILIST = \
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
LIBLIST = \
$(DESTDIRLIB)/istore.lib \
$(DESTDIRLIB)/ireg.lib \
@@ -99,11 +99,11 @@ SETTINGSLIST= \
$(DESTDIRSETTINGS)/dk.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.def
.ENDIF
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.map
.ENDIF
@@ -140,7 +140,7 @@ DOCUFILES= \
$(DESTDIRDOCUIMAGES)/sdk_line-1.gif \
$(DESTDIRDOCUIMAGES)/sdk_line-2.gif
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
INSTALLSCRIPT= \
$(DESTDIR)/config.guess \
$(DESTDIR)/config.sub \
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 8d753eb..31e526f 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -70,7 +70,7 @@ MY_COPY_RECURSIVE=$(GNUCOPY) -urf
MY_DELETE_RECURSIVE=rm -rf
MY_TEXTCOPY=@cp
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
#--------------------
# WNT ONLY
#--------------------
@@ -154,7 +154,7 @@ INCLUDETOPDIRLIST= \
$(INCOUT)/cppuhelper \
$(INCOUT)/registry
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
INCLUDETOPDIRLIST += $(INCOUT)/systools
.ENDIF
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk
index 5f1694e..3235e1e 100644
--- a/pyuno/CustomTarget_zipcore.mk
+++ b/pyuno/CustomTarget_zipcore.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,pyuno/zipcore))
# system python (only mingw)
ifeq ($(SYSTEM_PYTHON),YES)
# mingw: MINGW_SYSROOT is defined in configure
-ifeq ($(GUI)$(COM),WNTGCC)
+ifeq ($(OS)$(COM),WNTGCC)
pyuno_PYTHON_LIB_DIR=$(MINGW_SYSROOT)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
endif
else
diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk
index b88bc2b..30aac1d 100644
--- a/pyuno/Library_pyuno_wrapper.mk
+++ b/pyuno/Library_pyuno_wrapper.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_externals,pyuno_wrapper,\
python_headers \
))
-ifneq ($(GUI)$(COM),WNTMSC)
+ifneq ($(OS)$(COM),WNTMSC)
ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
$(eval $(call gb_Library_add_libs,pyuno_wrapper,\
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 723b085..0cdb458 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -59,7 +59,7 @@ endif
ifneq ($(SYSTEM_PYTHON),YES)
# zipcore: python.sh on Unix
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,pyuno,\
CustomTarget_python_shell \
Package_python_shell \
diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk
index 3672f61..f41f73f 100644
--- a/pyuno/Package_python_scripts.mk
+++ b/pyuno/Package_python_scripts.mk
@@ -26,7 +26,7 @@
$(eval $(call gb_Package_Package,pyuno_python,$(SRCDIR)/pyuno/source))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
pyuno_PYTHON_SCRIPT_DIR=bin
else
pyuno_PYTHON_SCRIPT_DIR=lib
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index 2f2ddda..343823d 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -15,7 +15,7 @@ readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/readme)
# what we need here is: gb_WITH_LANG_OR_DEFAULT ;-)
readlicense_oo_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/README_$(lang))
readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/README_%
else
@@ -68,7 +68,7 @@ $(readlicense_oo_README_PATTERN) : \
--stringparam type text \
$< \
$(readlicense_oo_README_XRM) && \
- $(if $(filter WNT,$(GUI)) \
+ $(if $(filter WNT,$(OS)) \
,$(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp && \
mv $@.tmp $@ && \
rm $@.out \
diff --git a/readlicense_oo/Package_readme.mk b/readlicense_oo/Package_readme.mk
index e1fabb2..d0e86dd 100644
--- a/readlicense_oo/Package_readme.mk
+++ b/readlicense_oo/Package_readme.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,readlicense_oo_readme_inc,$(call gb_CustomTarge
$(eval $(call gb_Package_add_files,readlicense_oo_readme_inc,bin/osl,\
$(foreach lang,en-US $(filter-out en-US,$(gb_WITH_LANG)),\
- $(if $(filter UNX,$(GUI)),README_$(lang),readme_$(lang).txt) \
+ $(if $(filter-out WNT,$(OS)),README_$(lang),readme_$(lang).txt) \
) \
))
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 8244d0d..3617fea 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -62,7 +62,7 @@ OOO_PATCH_FILES= \
raptor-aix.patch \
$(TARFILE_NAME).entities.patch
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
.ENDIF
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index d10239b..6fa1260 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -59,7 +59,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \
rasqal-aix.patch
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
.ENDIF
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 6459f6b..7442039 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -59,7 +59,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \
redland-aix.patch
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
.ENDIF
diff --git a/registry/workben/makefile.mk b/registry/workben/makefile.mk
index 32b8b0e..7d90464 100644
--- a/registry/workben/makefile.mk
+++ b/registry/workben/makefile.mk
@@ -32,7 +32,7 @@ ENABLE_EXCEPTIONS := TRUE
CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
RGTLIB = rgt.lib
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
RGTLIB = -lrgt$(DLLPOSTFIX)
.ENDIF
@@ -52,7 +52,7 @@ APP1STDLIBS=\
APP2TARGET= test
APP2OBJS= $(OBJ)$/test.obj
APP2RPATH=NONE
-.IF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX"
+.IF "$(OS)"!="WNT" && "$(OS)"!="MACOSX"
.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
APP2LINKFLAGS=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\'
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 2138f87..f191867 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -90,7 +90,7 @@ $(eval $(call gb_Executable_add_cobjects,rsc,\
rsc/source/rscpp/cpp6 \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Executable_add_defs,rsc,\
-Dunix \
))
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 878453b..80dc9ed 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -75,7 +75,7 @@ $(eval $(call gb_Library_use_system_win32_libs,sal,\
))
$(eval $(call gb_Library_add_libs,sal,\
- $(if $(filter $(GUI),UNX), \
+ $(if $(filter-out $(OS),WNT), \
$(if $(filter $(OS),ANDROID),, \
-lpthread \
) \
@@ -164,7 +164,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
))
endif
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/conditn \
sal/osl/unx/diagnose \
@@ -224,7 +224,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
))
endif
-else # $(GUI) != UNX
+else # $(OS) == WNT
# FIXME ?
# .IF "$(CCNUMVER)" >= "001400000000"
@@ -262,6 +262,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/w32/util \
))
-endif # ifeq ($(GUI),UNX)
+endif # ifneq ($(OS),WNT)
# vim: set noet sw=4 ts=4:
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index 4b70a48..6726571 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -126,22 +126,17 @@ sub checkForKillobj()
# ------------------------------------------------------------------------------
sub initEnvironment()
{
- my $gui = $ENV{GUI};
+ my $os = $ENV{OS};
# no error output in forms of message boxes
$ENV{'DISABLE_SAL_DBGBOX'}="t";
SWITCH: {
- if ( $gui eq "WNT" ) {
+ if ( $os eq "WNT" ) {
$FS = "\\";
$g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
last SWITCH;
}
- if ( $gui eq "WIN" ) {
- $FS = "\\";
- $g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
- last SWITCH;
- }
- if ( $gui eq "UNX" ) {
+ else {
$FS = "/";
$g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "${FS}tmp${FS}";
last SWITCH;
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index 7af519f..30390fd 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index b2bbd09..271bcc8 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 3e502cf..9bfe623 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index e44ecb8..5da5af6 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 07f0a4b..86fdf91 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index d829424..1e8529a 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index c02148f..22971a2 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/test/bootstrap.pl b/sal/test/bootstrap.pl
index c5bf519..7ef389d 100644
--- a/sal/test/bootstrap.pl
+++ b/sal/test/bootstrap.pl
@@ -64,7 +64,7 @@ if (!$rc) {
$state = 0;
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap", "auxaux", "-env:iniName=ini.ini", '-env:MYBOOTSTRAPTESTVALUE=$CUSTOMINIVALUE';
}
else {
@@ -75,7 +75,7 @@ if (!$rc) {
$state = 0;
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$comment = $comment . '$SYSUSERHOME not testable under windows' . "\n";
}
else {
@@ -86,7 +86,7 @@ else {
}
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$comment = $comment . '$SYSUSERCONFIG' . " not testable under windows\n";
}
else {
@@ -97,7 +97,7 @@ else {
}
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$comment = $comment . '$SYSBINDIR' . " not testable under windows\n";
}
else {
@@ -108,7 +108,7 @@ else {
}
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap", "inherited_value", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_VALUE', "-env:iniName=ini.ini";
}
else {
@@ -119,7 +119,7 @@ if (!$rc) {
$state = 0;
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap", "not_overwritten", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_OVERWRITTEN_VALUE', "-env:iniName=ini.ini";
}
else {
@@ -137,7 +137,7 @@ if (!$rc) {
$state = 0;
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap", "defaultValue", "-env:iniName=default.ini", "-env:INIFILENAME=", "-env:USEDEFAULT=1";
}
else {
@@ -213,7 +213,7 @@ if (!$rc) {
}
# test no infinit recursion
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap",
'"***RECURSION DETECTED***"',
'-env:MYBOOTSTRAPTESTVALUE=$MYBOOTSTRAPTESTVALUE';
diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk
index 94709ba..25aa5dd 100644
--- a/sal/test/makefile.mk
+++ b/sal/test/makefile.mk
@@ -33,7 +33,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
# ------------------------------------------------------------------
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
BOOTSTRAPSCRIPT=bootstrap.bat
BOOTSTRAPINI=testbootstrap.ini
MY_SCRIPTCAT=cat
@@ -73,7 +73,7 @@ ALL : ALLTAR \
$(BIN)$/bootstrap.pl
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
ALL: $(BIN)$/$(APP2TARGET).exe \
$(BIN)$/inirc \
$(BIN)$/defaultrc
@@ -124,7 +124,7 @@ ALL: ALLDEP
$(BIN)$/$(BOOTSTRAPSCRIPT) : $(BOOTSTRAPSCRIPT)
$(MY_SCRIPTCAT) $(BOOTSTRAPSCRIPT) > $@
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
chmod ug+x $@
.ENDIF
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index eb3873a..b7141a7 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -163,13 +163,13 @@ APP10DEPN=$(LB)$/isal.lib
SHL10OBJS=$(SLO)$/t_osl_getVolInfo.obj
SHL10TARGET=togvi
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
APP10STDLIBS=$(KERNEL32LIB)
SHL10STDLIBS=$(LB)$/isal.lib
SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL10STDLIBS=$(LB)$/libsal.so
SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
.ENDIF
@@ -186,20 +186,20 @@ OBJFILES+=\
APP10TARGET=ojpx
APP10OBJS=$(OBJ)$/t_ojp_exe.obj
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP10STDLIBS=$(LB)$/libsal.so
.ENDIF
SHL10OBJS=$(SLO)$/t_osl_joinProcess.obj
SHL10TARGET=tojp
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
APP10STDLIBS=$(KERNEL32LIB)
SHL10STDLIBS=$(LB)$/isal.lib
SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL10STDLIBS=$(LB)$/libsal.so
SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
.ENDIF
diff --git a/sane/Module_sane.mk b/sane/Module_sane.mk
index f812df7..f878c2a 100644
--- a/sane/Module_sane.mk
+++ b/sane/Module_sane.mk
@@ -29,7 +29,7 @@
$(eval $(call gb_Module_Module,sane))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifneq (,$(filter SANE,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,sane,\
Package_inc \
diff --git a/sc/workben/makefile.mk b/sc/workben/makefile.mk
index 40260ff..6ac9009 100644
--- a/sc/workben/makefile.mk
+++ b/sc/workben/makefile.mk
@@ -69,7 +69,7 @@ SHL1OBJS= $(SLO)$/addin.obj $(SLO)$/result.obj $(SLO)$/workben$/testadd.obj
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
$(MISC)$/$(SHL1TARGET).def: makefile.mk
@echo ------------------------------
diff --git a/scp2/InstallModule_javafilter.mk b/scp2/InstallModule_javafilter.mk
index 117f598..c5d8ee0 100644
--- a/scp2/InstallModule_javafilter.mk
+++ b/scp2/InstallModule_javafilter.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/javafilter,\
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/javafilter,\
scp2/source/javafilter/module_javafilter \
- $(if $(filter WNT,$(GUI)),\
+ $(if $(filter WNT,$(OS)),\
scp2/source/javafilter/registryitem_javafilter \
) \
))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index a9c272e..f3e4015 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -206,7 +206,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
scp2/source/ooo/scpaction_ooo \
scp2/source/ooo/shortcut_ooo \
scp2/source/ooo/ure_into_ooo \
- $(if $(filter WNTGCC,$(GUI)$(COM)),\
+ $(if $(filter WNTGCC,$(OS)$(COM)),\
scp2/source/ooo/mingw_dlls \
) \
))
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index eedc2cb..7153dee 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/python,\
))
# mingw: mix mode copy file from system python to installation set
-ifeq ($(GUI)$(COM),WNTGCC)
+ifeq ($(OS)$(COM),WNTGCC)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DPYVERSION=$(PYTHON_VERSION) \
-DMINGW_SYSTEM_PYTHON \
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index dd9a4d0..a49c31f 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
scp2/ure \
scp2/writer \
scp2/xsltfilter \
- $(if $(filter WNT,$(GUI)),\
+ $(if $(filter WNT,$(OS)),\
scp2/activex \
scp2/quickstart \
scp2/windows \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index c4f8145..6a309b7 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallScript_sdkoo \
InstallScript_setup_osl \
InstallScript_test \
- $(if $(filter WNT,$(GUI)),\
+ $(if $(filter WNT,$(OS)),\
InstallModule_activex \
InstallModule_quickstart \
InstallModule_windows \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index b0946eb..19adf05 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -542,7 +542,7 @@ endif
endif
-ifeq ($(strip $(GUI)),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_cxxobjects,sd,\
sd/source/ui/app/optsitem \
sd/source/ui/func/futext \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 2304d49..e80316f 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -107,6 +107,6 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
))
# $(WORKDIR)/inc/sd/sddll0.hxx :
- # echo "#define" DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sd$(DLLPOSTFIX)$(DLLPOST)\" > $@
+ # echo "#define" DLL_NAME \"$(if $(filter-out WNT,$(OS)),lib)sd$(DLLPOSTFIX)$(DLLPOST)\" > $@
# vim: set noet sw=4 ts=4:
diff --git a/sd/workben/testdll/makefile b/sd/workben/testdll/makefile
index a508b41..5949866 100644
--- a/sd/workben/testdll/makefile
+++ b/sd/workben/testdll/makefile
@@ -62,7 +62,7 @@ SHL1OBJS= $(SLO)\test.obj
# --- Targets ------------------------------------------------------
!INCLUDE <target.mak>
-!IF "$(GUI)" == "WNT"
+!IF "$(OS)" == "WNT"
$(MISC)\$(SHL1TARGET).def: makefile
@echo ------------------------------
diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
index e8c7d04..874c965 100644
--- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk
+++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
@@ -31,7 +31,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk
index 5475ca2..aef948c 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -31,7 +31,7 @@ DYNAMIC_CRT=
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index b1d1362..1f54f35 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -32,7 +32,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 019dcae..81ff1c4 100644
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -31,7 +31,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index de3489c..d0a6a3c 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -36,7 +36,7 @@ UWINAPILIB=
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
STDSHL += \
$(ADVAPI32LIB)\
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index 3c83b3f..d9c111d 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -33,7 +33,7 @@ CFLAGS+=-DUNICODE -D_UNICODE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk
index c76ceeb..c96e298 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -31,7 +31,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
index 1a87315..cbc2652 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
@@ -27,7 +27,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
STDSHL=
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk
index afe0c75..7470886 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -29,7 +29,7 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
CFLAGS+=-D_STLP_USE_STATIC_LIB
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index e85acc4..5840a52 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -31,7 +31,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/thesaurus/makefile.mk b/setup_native/source/win32/customactions/thesaurus/makefile.mk
index 956f257..115b70e 100644
--- a/setup_native/source/win32/customactions/thesaurus/makefile.mk
+++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk
@@ -29,7 +29,7 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
CFLAGS+=-D_STLP_USE_STATIC_LIB
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index c991be2..daae318 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -32,7 +32,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 3726c4f..0b46299 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -118,7 +118,7 @@ $(eval $(call gb_Module_add_targets,shell,\
Executable_lngconvex \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,shell,\
Executable_gnome_open_url \
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 54db397..6c82793 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_targets,solenv,\
))
endif
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifneq ($(OS),IOS)
ifneq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,solenv,\
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 0ca5f4e..4f8199c 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -235,7 +235,7 @@
if (open (CMD_FILE, ">>$cmd_file")) {
select CMD_FILE;
$echo = 'echo ';
- if ($ENV{GUI_FOR_BUILD} ne 'UNX') {
+ if ($ENV{OS_FOR_BUILD} eq 'WNT') {
$new_line = "echo.\n";
print "\@$echo off\npushd\n";
} else {
@@ -275,7 +275,7 @@
print $new_line;
do_exit(1) if ($checkparents);
};
- if (($ENV{GUI_FOR_BUILD} ne 'UNX') && $cmd_file) {
+ if (($ENV{OS_FOR_BUILD} eq 'WNT') && $cmd_file) {
print "popd\n";
};
$ENV{mk_tmp} = '';
@@ -772,7 +772,7 @@ sub dmake_dir {
#if dmake fails, have a go at regenerating the dependencies
#and try again. dmakes normal failure is 255, while death on signal is 254
my $real_exit_code = $error_code >> 8;
- if (($ENV{GUI_FOR_BUILD} eq 'WNT') && ($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
+ if (($ENV{OS_FOR_BUILD} eq 'WNT') && ($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
print "Retrying $job_name\n";
$error_code = run_job($dmake, $job_name);
}
@@ -877,12 +877,12 @@ sub get_prj_platform {
sub get_deps_from_object {
my ($module, $build_list_object, $dependencies_hash) = @_;
- foreach my $dir ($build_list_object->getJobDirectories("make", $ENV{GUI})) {
+ foreach my $dir ($build_list_object->getJobDirectories("make", $ENV{OS})) {
$path_hash{$dir} = $module_paths{$module};
$path_hash{$dir} .= $dir if ($dir ne '/');
my %deps_hash = ();
- foreach my $dep ($build_list_object->getJobDependencies($dir, "make", $ENV{GUI})) {
+ foreach my $dep ($build_list_object->getJobDependencies($dir, "make", $ENV{OS})) {
$deps_hash{$dep}++;
};
$$dependencies_hash{$dir} = \%deps_hash;
@@ -1085,7 +1085,7 @@ sub get_commands {
check_dmake();
if ($cmd_file) {
- if ($ENV{GUI_FOR_BUILD} eq 'UNX') {
+ if ($ENV{OS_FOR_BUILD} ne 'WNT') {
$check_error_string = "if \"\$?\" != \"0\" exit\n";
} else {
$check_error_string = "if \"\%?\" != \"0\" quit\n";
@@ -1104,7 +1104,7 @@ sub get_commands {
# Procedure retrieves list of projects to be built from build.lst
#
sub get_workspace_path {
- if (!defined $ENV{GUI}) {
+ if (!defined $ENV{OS}) {
$ENV{mk_tmp} = '';
die "No environment set\n";
};
@@ -1142,8 +1142,8 @@ sub pick_prj_to_build {
sub check_platform {
my $platform = shift;
return 1 if ($platform eq 'all');
- return 1 if (($ENV{GUI} eq 'UNX') && ($platform eq 'u'));
- return 1 if (($ENV{GUI} eq 'WNT') &&
+ return 1 if (($ENV{OS} ne 'WNT') && ($platform eq 'u'));
+ return 1 if (($ENV{OS} eq 'WNT') &&
(($platform eq 'w') || ($platform eq 'n')));
return 0;
};
@@ -1604,7 +1604,7 @@ sub store_error {
my $child_nick = $processes_hash{$pid};
- if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
+ if ($ENV{OS_FOR_BUILD} eq 'WNT') {
if (!defined $had_error{$child_nick}) {
$had_error{$child_nick}++;
return 1;
@@ -1927,7 +1927,7 @@ sub do_custom_job {
$error_code = run_job($job, $module_paths{$module}, $module_job);
if ($error_code) {
# give windows one more chance
- if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
+ if ($ENV{OS_FOR_BUILD} eq 'WNT') {
$error_code = run_job($job, $module_paths{$module}, $module_job);
};
};
@@ -2877,7 +2877,7 @@ sub start_server_on_port {
my $port = shift;
my $socket_obj = shift;
$client_timeout = 1 if (!$parent_process);
- if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
+ if ($ENV{OS_FOR_BUILD} eq 'WNT') {
$$socket_obj = new IO::Socket::INET (#LocalAddr => hostname(),
LocalPort => $port,
Proto => 'tcp',
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 2d9f565..096e5bd 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -114,7 +114,6 @@ if ($^O ne 'cygwin') { # iz59477 - cygwin needes a dot "." at the e
}
}
-($gui = lc($ENV{GUI})) || die "Can't determine 'GUI'. Please set environment.\n";
$tempcounter = 0;
# zip is default for RE master builds
@@ -384,7 +383,7 @@ sub parse_options
$arg =~ /^-delete$/ and $opt_delete = 1 and next;
$arg =~ /^-dontdeletecommon$/ and $dontdeletecommon = 1 and next;
$arg =~ /^-help$/ and $opt_help = 1 and $arg = '';
- $arg =~ /^-link$/ and $ENV{GUI} ne 'WNT' and $opt_link = 1 and next;
+ $arg =~ /^-link$/ and $ENV{OS} ne 'WNT' and $opt_link = 1 and next;
$arg =~ /^-deloutput$/ and $opt_deloutput = 1 and next;
$arg =~ /^-debug$/ and $is_debug = 1 and next;
$arg =~ /^-checkdlst$/ and $opt_checkdlst = 1 and next;
@@ -458,11 +457,10 @@ sub init_globals
[ '%_DEST%', $dest ],
[ '%COMMON_OUTDIR%', $common_outdir ],
[ '%COMMON_DEST%', $common_dest ],
- [ '%GUI%', $gui ]
);
# find out if the *HOST* system supports symlinks. They all do except Windows
- $has_symlinks = $ENV{GUI} ne 'WNT';
+ $has_symlinks = $ENV{OS} ne 'WNT';
}
sub get_base
@@ -1321,7 +1319,7 @@ sub usage
print STDERR " -dontdeletecommon do not delete common files (for -delete option)\n";
print STDERR " -force copy even if not newer\n";
print STDERR " -help print this message\n";
- if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) {
+ if ( !defined($ENV{OS}) || $ENV{OS} ne 'WNT' ) {
print STDERR " -link hard link files into the solver to save disk space\n";
}
print STDERR " -quiet be quiet, only report errors\n";
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 99705f8..3f88c47 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -265,7 +265,7 @@ sub check_makecab_version
######################################################################
# Reading the environment variables for the paths in ziplist.
-# solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
+# solarpath, solarenvpath, solarcommonpath, os, pmiscpath
######################################################################
sub check_system_environment
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index a0cf5f3..646bf16 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -40,7 +40,7 @@ sub create_pathvariables
my %variables = ();
# The following variables are needed in the path file list
- # solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
+ # solarpath, solarenvpath, solarcommonpath, os, pmiscpath
my $solarpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
$variables{'solarpath'} = $solarpath;
@@ -48,9 +48,6 @@ sub create_pathvariables
my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension;
$variables{'solarcommonpath'} = $solarcommonpath;
- my $osdef = lc($environment->{'GUI'});
- $variables{'osdef'} = $osdef;
-
$variables{'os'} = $installer::globals::compiler;
my $solarenvpath = "";
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 3b086c6..9e806ca 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -27,7 +27,7 @@ my $tmp_dir;
# FIXME: really we should hunt and parse / source the config_host.mk magic I guess.
die "You need your environment setup right, eg. run make cmd cmd='ooinstall /path/to/install'" if (!defined $ENV{SRC_ROOT});
-if ($ENV{GUI} eq 'WNT') {
+if ($ENV{OS} eq 'WNT') {
$is_windows = 1;
}
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index b5a7956..ec70788 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -36,14 +36,14 @@ APP1STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP1RESO=
.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
APP1RESO=$(MISC)/$(APP1TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP1DEPN+:=$(APP1DEPNU)
USE_APP1DEF=
.ENDIF
@@ -55,7 +55,7 @@ APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
.ENDIF # "$(APP1PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP1LIBS)"!=""
$(MISC)/$(APP1TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -74,7 +74,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
$(APP1RES) \
$(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
@@ -114,7 +114,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP1LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP1LINKRES:b).rc
@@ -202,7 +202,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP1TARGETN)"!=""
@@ -246,14 +246,14 @@ APP2STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP2RESO=
.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
APP2RESO=$(MISC)/$(APP2TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP2DEPN+:=$(APP2DEPNU)
USE_APP2DEF=
.ENDIF
@@ -265,7 +265,7 @@ APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
.ENDIF # "$(APP2PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP2LIBS)"!=""
$(MISC)/$(APP2TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -284,7 +284,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
$(APP2RES) \
$(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
@@ -324,7 +324,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP2LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP2LINKRES:b).rc
@@ -412,7 +412,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP2TARGETN)"!=""
@@ -456,14 +456,14 @@ APP3STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP3RESO=
.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
APP3RESO=$(MISC)/$(APP3TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP3DEPN+:=$(APP3DEPNU)
USE_APP3DEF=
.ENDIF
@@ -475,7 +475,7 @@ APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
.ENDIF # "$(APP3PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP3LIBS)"!=""
$(MISC)/$(APP3TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -494,7 +494,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
$(APP3RES) \
$(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
@@ -534,7 +534,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP3LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP3LINKRES:b).rc
@@ -622,7 +622,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP3TARGETN)"!=""
@@ -666,14 +666,14 @@ APP4STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP4RESO=
.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
APP4RESO=$(MISC)/$(APP4TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP4DEPN+:=$(APP4DEPNU)
USE_APP4DEF=
.ENDIF
@@ -685,7 +685,7 @@ APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
.ENDIF # "$(APP4PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP4LIBS)"!=""
$(MISC)/$(APP4TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -704,7 +704,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
$(APP4RES) \
$(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
@@ -744,7 +744,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP4LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP4LINKRES:b).rc
@@ -832,7 +832,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP4TARGETN)"!=""
@@ -876,14 +876,14 @@ APP5STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP5RESO=
.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
APP5RESO=$(MISC)/$(APP5TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP5DEPN+:=$(APP5DEPNU)
USE_APP5DEF=
.ENDIF
@@ -895,7 +895,7 @@ APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
.ENDIF # "$(APP5PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP5LIBS)"!=""
$(MISC)/$(APP5TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -914,7 +914,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
$(APP5RES) \
$(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
@@ -954,7 +954,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP5LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP5LINKRES:b).rc
@@ -1042,7 +1042,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP5TARGETN)"!=""
@@ -1086,14 +1086,14 @@ APP6STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP6RESO=
.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
APP6RESO=$(MISC)/$(APP6TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP6DEPN+:=$(APP6DEPNU)
USE_APP6DEF=
.ENDIF
@@ -1105,7 +1105,7 @@ APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
.ENDIF # "$(APP6PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP6LIBS)"!=""
$(MISC)/$(APP6TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1124,7 +1124,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
$(APP6RES) \
$(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
@@ -1164,7 +1164,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP6LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP6LINKRES:b).rc
@@ -1252,7 +1252,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP6TARGETN)"!=""
@@ -1296,14 +1296,14 @@ APP7STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP7RESO=
.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
APP7RESO=$(MISC)/$(APP7TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP7DEPN+:=$(APP7DEPNU)
USE_APP7DEF=
.ENDIF
@@ -1315,7 +1315,7 @@ APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
.ENDIF # "$(APP7PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP7LIBS)"!=""
$(MISC)/$(APP7TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1334,7 +1334,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
$(APP7RES) \
$(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
@@ -1374,7 +1374,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP7LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP7LINKRES:b).rc
@@ -1462,7 +1462,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP7TARGETN)"!=""
@@ -1506,14 +1506,14 @@ APP8STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP8RESO=
.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
APP8RESO=$(MISC)/$(APP8TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP8DEPN+:=$(APP8DEPNU)
USE_APP8DEF=
.ENDIF
@@ -1525,7 +1525,7 @@ APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
.ENDIF # "$(APP8PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP8LIBS)"!=""
$(MISC)/$(APP8TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1544,7 +1544,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
$(APP8RES) \
$(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
@@ -1584,7 +1584,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP8LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP8LINKRES:b).rc
@@ -1672,7 +1672,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP8TARGETN)"!=""
@@ -1716,14 +1716,14 @@ APP9STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP9RESO=
.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
APP9RESO=$(MISC)/$(APP9TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP9DEPN+:=$(APP9DEPNU)
USE_APP9DEF=
.ENDIF
@@ -1735,7 +1735,7 @@ APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
.ENDIF # "$(APP9PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP9LIBS)"!=""
$(MISC)/$(APP9TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1754,7 +1754,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
$(APP9RES) \
$(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
@@ -1794,7 +1794,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP9LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP9LINKRES:b).rc
@@ -1882,7 +1882,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP9TARGETN)"!=""
@@ -1926,14 +1926,14 @@ APP10STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP10RESO=
.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
APP10RESO=$(MISC)/$(APP10TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP10DEPN+:=$(APP10DEPNU)
USE_APP10DEF=
.ENDIF
@@ -1945,7 +1945,7 @@ APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
.ENDIF # "$(APP10PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP10LIBS)"!=""
$(MISC)/$(APP10TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1964,7 +1964,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
$(APP10RES) \
$(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
@@ -2004,7 +2004,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP10LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP10LINKRES:b).rc
@@ -2092,7 +2092,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP10TARGETN)"!=""
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index b0b35d8..38e9dda 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -13,7 +13,7 @@ DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
.IF "$(SHL1VERSIONMAP)"!=""
.IF "$(DEF1EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF1EXPORTFILE) : $(SHL1OBJS) $(SHL1LIBS)
@@ -34,12 +34,12 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF1EXPORTFILE)"==""
.ENDIF # "$(SHL1VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF1FILTER=$(SOLARENV)/inc/dummy.flt
@@ -155,9 +155,9 @@ $(DEF1TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF1TARGETN): \
$(DEF1DEPN) \
$(DEF1EXPORTFILE)
@@ -182,7 +182,7 @@ DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
.IF "$(SHL2VERSIONMAP)"!=""
.IF "$(DEF2EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF2EXPORTFILE) : $(SHL2OBJS) $(SHL2LIBS)
@@ -203,12 +203,12 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF2EXPORTFILE)"==""
.ENDIF # "$(SHL2VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF2FILTER=$(SOLARENV)/inc/dummy.flt
@@ -324,9 +324,9 @@ $(DEF2TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF2TARGETN): \
$(DEF2DEPN) \
$(DEF2EXPORTFILE)
@@ -351,7 +351,7 @@ DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
.IF "$(SHL3VERSIONMAP)"!=""
.IF "$(DEF3EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF3EXPORTFILE) : $(SHL3OBJS) $(SHL3LIBS)
@@ -372,12 +372,12 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF3EXPORTFILE)"==""
.ENDIF # "$(SHL3VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF3FILTER=$(SOLARENV)/inc/dummy.flt
@@ -493,9 +493,9 @@ $(DEF3TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF3TARGETN): \
$(DEF3DEPN) \
$(DEF3EXPORTFILE)
@@ -520,7 +520,7 @@ DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
.IF "$(SHL4VERSIONMAP)"!=""
.IF "$(DEF4EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF4EXPORTFILE) : $(SHL4OBJS) $(SHL4LIBS)
@@ -541,12 +541,12 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF4EXPORTFILE)"==""
.ENDIF # "$(SHL4VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF4FILTER=$(SOLARENV)/inc/dummy.flt
@@ -662,9 +662,9 @@ $(DEF4TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF4TARGETN): \
$(DEF4DEPN) \
$(DEF4EXPORTFILE)
@@ -689,7 +689,7 @@ DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
.IF "$(SHL5VERSIONMAP)"!=""
.IF "$(DEF5EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF5EXPORTFILE) : $(SHL5OBJS) $(SHL5LIBS)
@@ -710,12 +710,12 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF5EXPORTFILE)"==""
.ENDIF # "$(SHL5VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF5FILTER=$(SOLARENV)/inc/dummy.flt
@@ -831,9 +831,9 @@ $(DEF5TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF5TARGETN): \
$(DEF5DEPN) \
$(DEF5EXPORTFILE)
@@ -858,7 +858,7 @@ DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
.IF "$(SHL6VERSIONMAP)"!=""
.IF "$(DEF6EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF6EXPORTFILE) : $(SHL6OBJS) $(SHL6LIBS)
@@ -879,12 +879,12 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF6EXPORTFILE)"==""
.ENDIF # "$(SHL6VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF6FILTER=$(SOLARENV)/inc/dummy.flt
@@ -1000,9 +1000,9 @@ $(DEF6TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF6TARGETN): \
$(DEF6DEPN) \
$(DEF6EXPORTFILE)
@@ -1027,7 +1027,7 @@ DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
.IF "$(SHL7VERSIONMAP)"!=""
.IF "$(DEF7EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF7EXPORTFILE) : $(SHL7OBJS) $(SHL7LIBS)
@@ -1048,12 +1048,12 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF7EXPORTFILE)"==""
.ENDIF # "$(SHL7VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF7FILTER=$(SOLARENV)/inc/dummy.flt
@@ -1169,9 +1169,9 @@ $(DEF7TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF7TARGETN): \
$(DEF7DEPN) \
$(DEF7EXPORTFILE)
@@ -1196,7 +1196,7 @@ DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
.IF "$(SHL8VERSIONMAP)"!=""
.IF "$(DEF8EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list