summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
Diffstat (limited to 'sal')
-rw-r--r--sal/Library_sal.mk8
-rw-r--r--sal/qa/buildall.pl11
-rw-r--r--sal/qa/osl/socket/osl_AcceptorSocket.cxx4
-rw-r--r--sal/qa/osl/socket/osl_ConnectorSocket.cxx4
-rw-r--r--sal/qa/osl/socket/osl_DatagramSocket.cxx4
-rw-r--r--sal/qa/osl/socket/osl_Socket.cxx4
-rw-r--r--sal/qa/osl/socket/osl_Socket2.cxx4
-rw-r--r--sal/qa/osl/socket/osl_SocketAddr.cxx4
-rw-r--r--sal/qa/osl/socket/osl_StreamSocket.cxx4
-rw-r--r--sal/test/bootstrap.pl16
-rw-r--r--sal/test/makefile.mk6
-rw-r--r--sal/workben/makefile.mk10
12 files changed, 37 insertions, 42 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 878453b52b2e..80dc9edfe02b 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 4b70a4884559..67265710b11a 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 7af519fc49d7..30390fd72ac8 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 b2bbd095ed1f..271bcc83a61e 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 3e502cf11d67..9bfe6234b596 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 e44ecb86c519..5da5af638914 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 07f0a4bbd48d..86fdf91ec7ea 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 d82942417dc8..1e8529a40cd7 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 c02148f6783a..22971a2a751a 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 c5bf519fefee..7ef389d99747 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 94709bad3e6b..25aa5dd5fa17 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 eb3873aa3db5..b7141a73d9db 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
generated by cgit (git 2.34.1) at 2024-07-09 15:16:57 +0000