Skip to content

Commit 8897778

Browse files
sip: made trunk build and install
git-svn-id: http://svn.netlabs.org/repos/ports/sip/trunk@1570 8d6eb4b1-0faa-de11-b929-00e081727c95
1 parent c1dd789 commit 8897778

File tree

4 files changed

+161
-2
lines changed

4 files changed

+161
-2
lines changed

configure.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ def set_build_platform():
146146
"openbsd": "openbsd-g++",
147147
"openunix": "unixware-cc",
148148
"osf1": "tru64-cxx",
149+
"os2knix": "os2-g++" ,
149150
"qnx": "qnx-g++",
150151
"reliantunix": "reliant-cds",
151152
"sco_sv": "sco-cc",

macros.sip

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
%_sip_api_major 11
2+
%_sip_api_minor 3
3+
%_sip_api %{_sip_api_major}.%{_sip_api_minor}

siputils.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,11 @@ def finalise(self):
444444
if sys.platform == "cygwin":
445445
libdir.append(self.config.py_lib_dir)
446446

447+
py_lib = "python%u.%u" % ((self.config.py_version >> 16), ((self.config.py_version >> 8) & 0xff))
448+
libs.append(self.platform_lib(py_lib))
449+
elif sys.platform == "os2knix":
450+
libdir.append(self.config.py_lib_dir)
451+
447452
py_lib = "python%u.%u" % ((self.config.py_version >> 16), ((self.config.py_version >> 8) & 0xff))
448453
libs.append(self.platform_lib(py_lib))
449454
elif sys.platform == "win32":
@@ -857,6 +862,8 @@ def _qt_module_to_lib(self, mname):
857862
if self._debug:
858863
if sys.platform == "win32":
859864
lib = lib + "d"
865+
elif sys.platform == "os2knix":
866+
lib = lib + "d"
860867
elif sys.platform == "darwin":
861868
if not self._is_framework(mname):
862869
lib = lib + "_debug"
@@ -1517,6 +1524,9 @@ def __init__(self, configuration, build_file, install_dir=None, static=0,
15171524
if sys.platform == "win32" and debug:
15181525
self._target = self._target + "_d"
15191526

1527+
if sys.platform == "os2knix" and debug:
1528+
self._target = self._target + "_d"
1529+
15201530
def finalise(self):
15211531
"""Finalise the macros common to all module Makefiles.
15221532
"""
@@ -1638,6 +1648,8 @@ def generate_macros_and_rules(self, mfile):
16381648
else:
16391649
if sys.platform == "win32":
16401650
ext = "pyd"
1651+
elif sys.platform == "os2knix":
1652+
ext = "pyd"
16411653
elif sys.platform == "darwin":
16421654
ext = "so"
16431655
elif sys.platform == "cygwin":
@@ -1844,7 +1856,7 @@ def build_command(self, source):
18441856
# The name of the executable.
18451857
self._target, _ = os.path.splitext(source)
18461858

1847-
if sys.platform in ("win32", "cygwin"):
1859+
if sys.platform in ("win32", "cygwin", "os2knix"):
18481860
exe = self._target + ".exe"
18491861
else:
18501862
exe = self._target
@@ -1952,7 +1964,7 @@ def generate_macros_and_rules(self, mfile):
19521964

19531965
target = self._build["target"]
19541966

1955-
if sys.platform in ("win32", "cygwin"):
1967+
if sys.platform in ("win32", "cygwin", "os2knix"):
19561968
target = target + ".exe"
19571969

19581970
mfile.write("TARGET = %s\n" % target)

specs/os2-g++

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
#
2+
# qmake configuration for os2-g++
3+
#
4+
# Written for Innotek GCC/kLIBC and IBM ILINK or OpenWatcom WLINK
5+
#
6+
7+
MAKEFILE_GENERATOR = UNIX
8+
TEMPLATE = app
9+
CONFIG += qt warn_on release link_prl copy_dir_files
10+
QT += core gui
11+
# @todo
12+
#DEFINES += QT_LARGEFILE_SUPPORT
13+
QMAKE_COMPILER_DEFINES += __OS2__ __EMX__ __INNOTEK_LIBC__ __GNUC__
14+
15+
QMAKE_LINKER_TYPE = wlink
16+
CONFIG *= wlink
17+
18+
QMAKE_EXT_OBJ = .obj
19+
QMAKE_EXT_RES = _res.obj
20+
21+
QMAKE_CC = gcc
22+
QMAKE_LEX = flex
23+
QMAKE_LEXFLAGS =
24+
QMAKE_YACC = byacc
25+
QMAKE_YACCFLAGS = -d
26+
QMAKE_CFLAGS = -Zomf -march=i486 -mtune=generic
27+
QMAKE_CFLAGS_DEPS = -M
28+
QMAKE_CFLAGS_WARN_ON = -Wall
29+
QMAKE_CFLAGS_WARN_OFF = -w
30+
QMAKE_CFLAGS_RELEASE = -s -O2
31+
QMAKE_CFLAGS_DEBUG = -g
32+
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
33+
34+
QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
35+
QMAKE_CFLAGS_USE_PRECOMPILE = -include ${QMAKE_PCH_OUTPUT_BASE}
36+
37+
QMAKE_CFLAGS_INCDIR = -I
38+
39+
QMAKE_CXX = g++
40+
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
41+
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
42+
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
43+
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
44+
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
45+
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
46+
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
47+
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
48+
QMAKE_CXXFLAGS_RTTI_ON = -frtti
49+
QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
50+
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions
51+
QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
52+
53+
# make sure includes from the project directory are always found
54+
QMAKE_INCDIR = .
55+
56+
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
57+
QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
58+
59+
QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
60+
QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
61+
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
62+
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
63+
QMAKE_OBJECTS_REF = $(OBJECTS)
64+
65+
QMAKE_LINK = g++
66+
QMAKE_LINK_C = gcc
67+
68+
QMAKE_LFLAGS = -Zomf -Zstack 0x2000 -Zlinker \"DISABLE 1121\"
69+
QMAKE_LFLAGS_EXCEPTIONS_ON =
70+
QMAKE_LFLAGS_EXCEPTIONS_OFF =
71+
QMAKE_LFLAGS_RELEASE = -s
72+
QMAKE_LFLAGS_DEBUG =
73+
QMAKE_LFLAGS_CONSOLE = -Zlinker /PM:VIO
74+
QMAKE_LFLAGS_WINDOWS = -Zlinker /PM:PM -Zno-fork
75+
QMAKE_LFLAGS_DLL = -Zdll
76+
QMAKE_LFLAGS_MAP = -Zmap
77+
QMAKE_LFLAGS_HIGHMEM = -Zhigh-mem
78+
QMAKE_LFLAGS_LIBDIR = -L
79+
QMAKE_LFLAGS_LIB = -l
80+
81+
QMAKE_RUN_LINK = $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) $(DEF_FILE) -Wl,$$QMAKE_OBJECTS_REF $(LIBS)
82+
83+
QMAKE_RUN_IMPLIB = emximp -p 128 -o $@ $<
84+
85+
QMAKE_RUN_GENDEF = \
86+
$(QMAKESPECDIR)/emxexpw.cmd -name $(basename $(TARGET)) \
87+
-def $(DEF_FILE) \
88+
$(if $(DEF_FILE_VERSION),-version \"$(DEF_FILE_VERSION)\") \
89+
$(if $(DEF_FILE_DESCRIPTION),-desc \"$(DEF_FILE_DESCRIPTION)\") \
90+
$(if $(DEF_FILE_VENDOR),-vendor \"$(DEF_FILE_VENDOR)\") \
91+
$(if $(DEF_FILE_TEMPLATE),-template \"$(DEF_FILE_TEMPLATE)\")
92+
93+
QMAKE_RUN_GENDEF_EXPORT_ALL = $$QMAKE_RUN_GENDEF \
94+
$(if $(DEF_FILE_MAP),-map \"$(DEF_FILE_MAP)\") \
95+
$$QMAKE_OBJECTS_REF
96+
97+
QMAKE_RUN_GENDEF_EXE = $$QMAKE_RUN_GENDEF \
98+
$(if $(DEF_FILE_EXETYPE),-exe \"$(DEF_FILE_EXETYPE)\")
99+
100+
QMAKE_LIBS =
101+
QMAKE_LIBS_CORE = -lregistry.dll -lsocket
102+
QMAKE_LIBS_GUI =
103+
QMAKE_LIBS_NETWORK =
104+
QMAKE_LIBS_OPENGL =
105+
QMAKE_LIBS_COMPAT =
106+
QMAKE_LIBS_QT_ENTRY =
107+
108+
QMAKE_LIB = emxomfar r
109+
QMAKE_RUN_LIB = $(LIB) $(DESTDIR_TARGET) $$QMAKE_OBJECTS_REF
110+
111+
QMAKE_DIR_SEP = /
112+
QMAKE_COPY = cp
113+
QMAKE_COPY_DIR = $(QMAKESPECDIR)/cpdir.cmd
114+
QMAKE_MOVE = mv
115+
QMAKE_DEL_FILE = rm
116+
QMAKE_MKDIR = mkdir -p
117+
QMAKE_DEL_DIR = rmdir
118+
QMAKE_CHK_DIR_EXISTS = test -d
119+
120+
QMAKE_MOC = moc.exe
121+
QMAKE_UIC = uic.exe
122+
QMAKE_IDC = idc.exe
123+
124+
QMAKE_IDL =
125+
QMAKE_ZIP = zip -r -9
126+
127+
QMAKE_RC = rc
128+
QMAKE_RUN_RC2RES_ENV = export INCLUDE = $(INCLUDEPATH)
129+
QMAKE_RUN_RC2RES = $(RC) -n -r $(RC_FILE) $(RES_FILE)
130+
QMAKE_RUN_RC2EXE = $(RC) -n -x2 $(RES_FILE) $(DESTDIR_TARGET)
131+
132+
QMAKE_STRIP =
133+
134+
QMAKE_MAP_FILE = $(basename $(DESTDIR_TARGET)).map
135+
QMAKE_SYM_FILE = $(basename $(DESTDIR_TARGET)).sym
136+
QMAKE_RUN_MAPSYM = $(QMAKESPECDIR)/runmapsym.cmd \
137+
$(QMAKESPECDIR)/wmapsym.cmd $$QMAKE_MAP_FILE $$QMAKE_SYM_FILE
138+
139+
QMAKE_IFDEF = ifdef
140+
QMAKE_IFNDEF = ifndef
141+
QMAKE_ENDIF = endif
142+
143+
load(qt_config)

0 commit comments

Comments
 (0)