summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorPale Moon <git-repo@palemoon.org>2014-09-24 16:59:47 +0200
committerPale Moon <git-repo@palemoon.org>2014-09-24 16:59:47 +0200
commit93b9490b500d9c053c236452df373bc46cae85c5 (patch)
tree9d57a2935bd7e4279b866b465a585be1714aeb87 /build
parentf89dce3c82db7fabe2d3a933618f4d89a121ed2b (diff)
downloadpalemoon-gre-93b9490b500d9c053c236452df373bc46cae85c5.tar.gz
Remove OS/2 code part 1
Diffstat (limited to 'build')
-rw-r--r--build/binary-location.mk2
-rw-r--r--build/moz.build6
-rw-r--r--build/os2/test_os2.cmd21
3 files changed, 4 insertions, 25 deletions
diff --git a/build/binary-location.mk b/build/binary-location.mk
index 7713e1a0c..e3c14ac85 100644
--- a/build/binary-location.mk
+++ b/build/binary-location.mk
@@ -4,7 +4,7 @@
# finds the location of the browser and puts it in the variable $(browser_path)
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+ifneq (,$(filter WINNT,$(OS_ARCH)))
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
else
PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
diff --git a/build/moz.build b/build/moz.build
index f873ef09b..6d6e8ecbb 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -4,10 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-if CONFIG['OS_ARCH'] not in ('WINNT', 'OS2'):
- DIRS += ['unix']
-elif CONFIG['OS_ARCH'] == 'WINNT':
+if CONFIG['OS_ARCH'] == 'WINNT':
DIRS += ['win32']
+else:
+ DIRS += ['unix']
if CONFIG['STLPORT_SOURCES']:
DIRS += ['stlport']
diff --git a/build/os2/test_os2.cmd b/build/os2/test_os2.cmd
deleted file mode 100644
index 389dea091..000000000
--- a/build/os2/test_os2.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-REM This Source Code Form is subject to the terms of the Mozilla Public
-REM License, v. 2.0. If a copy of the MPL was not distributed with this
-REM file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-/* Invoke unit tests on OS/2 */
-PARSE ARG dist prog parm
-dist=forwardtoback(dist);
-prog=forwardtoback(prog);
-'set BEGINLIBPATH='dist'\bin;%BEGINLIBPATH%'
-'set LIBPATHSTRICT=T'
-prog parm
-exit
-
-forwardtoback: procedure
- arg pathname
- parse var pathname pathname'/'rest
- do while (rest <> "")
- pathname = pathname'\'rest
- parse var pathname pathname'/'rest
- end
- return pathname