TDE
/
sip4-tqt
6
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Rename sip into sip-trinity in order to be conflict free with upstream.

Browse Source 
This relate to bug request 2699.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
gregory guy 3 years ago
parent 65411c74aa
commit f7ee272605
No known key found for this signature in database
GPG Key ID: 2CC84A1CC6823AF8
15 changed files with 117 additions and 33 deletions
Show Stats Download Patch File Download Diff File

35
configure.py
Unescape View File

@ -129,7 +129,7 @@ def set_defaults():
"cygwin": "cygwin-g++",
"darwin": "macx-g++",
"dgux": "dgux-g++",
"freebsd": "freebsd-g++",
"freebsd": "freebsd-clang",
"gnu": "hurd-g++",
"hp-ux": "hpux-acc",
"irix": "irix-cc",
@ -165,7 +165,7 @@ def set_defaults():
break
default_sipbindir = plat_bin_dir
default_sipmoddir = os.path.join(plat_py_site_dir, 'sip4_tqt')
default_sipmoddir = os.path.join(plat_py_site_dir, 'sip-trinity')
default_sipincdir = plat_py_inc_dir
default_sipsipdir = plat_sip_dir
@ -207,7 +207,7 @@ def set_platform_directories():
plat_py_lib_dir = lib_dir + "/config"
plat_bin_dir = sys.exec_prefix + "/bin"
plat_sip_dir = sys.prefix + "/share/sip"
plat_sip_dir = sys.prefix + "/share/sip-trinity"
def create_config(module, template, macros):
@ -225,7 +225,7 @@ def create_config(module, template, macros):
"sip_version": sip_version,
"sip_version_str": sip_version_str,
"platform": opts.platform,
"sip_bin": os.path.join(opts.sipbindir, "sip"),
"sip_bin": os.path.join(opts.sipbindir, "sip-trinity"),
"sip_inc_dir": opts.sipincdir,
"sip_mod_dir": opts.sipmoddir,
"default_bin_dir": plat_bin_dir,
@ -249,26 +249,26 @@ def create_makefiles(macros, extra_lib_dir=None, extra_libs=None):
"""
# Bootstrap. Make sure we get the right one.
sys.path.insert(0, os.path.curdir)
import sipconfig
import siptrinityconfig
cfg = sipconfig.Configuration()
cfg = siptrinityconfig.Configuration()
cfg.set_build_macros(macros)
sipconfig.inform("Creating top level Makefile...")
siptrinityconfig.inform("Creating top level Makefile...")
open('__init__.py', 'a').close()
sipconfig.ParentMakefile(
siptrinityconfig.ParentMakefile(
configuration=cfg,
subdirs=["sipgen", "siplib"],
installs=(["__init__.py", "sipconfig.py", os.path.join(src_dir, "sipdistutils.py")],
installs=(["siptrinityconfig.py", os.path.join(src_dir, "siptrinitydistutils.py")],
cfg.sip_mod_dir)
).generate()
sipconfig.inform("Creating sip code generator Makefile...")
siptrinityconfig.inform("Creating sip code generator Makefile...")
sipconfig.ProgramMakefile(
siptrinityconfig.ProgramMakefile(
configuration=cfg,
build_file=os.path.join(src_dir, "sipgen", "sipgen.sbf"),
dir="sipgen",
@ -279,14 +279,14 @@ def create_makefiles(macros, extra_lib_dir=None, extra_libs=None):
arch=opts.arch
).generate()
sipconfig.inform("Creating sip module Makefile...")
siptrinityconfig.inform("Creating sip module Makefile...")
makefile = sipconfig.ModuleMakefile(
makefile = siptrinityconfig.ModuleMakefile(
configuration=cfg,
build_file=os.path.join(src_dir, "siplib", "siplib.sbf"),
dir="siplib",
install_dir=cfg.sip_mod_dir,
installs=([os.path.join(src_dir, "siplib", "sip.h")], cfg.sip_inc_dir),
installs=([os.path.join(src_dir, "siplib", "sip-trinity.h")], cfg.sip_inc_dir),
console=1,
warnings=0,
static=opts.static,
@ -389,7 +389,10 @@ def main(argv):
argv is the list of command line arguments.
"""
siputils.inform("This is SIP %s for Python %s on %s." % (sip_version_str, sys.version.split()[0], sys.platform))
if sys.platform == 'linux2':
PlatForm = "GNU/Linux"
siputils.inform("This is SIP %s for Python %s on %s platform." % (sip_version_str, sys.version.split()[0], PlatForm))
if py_version < 0x020300:
siputils.error("This version of SIP requires Python v2.3 or later.")
@ -467,7 +470,7 @@ def main(argv):
inform_user()
# Install the configuration module.
create_config("sipconfig.py", os.path.join(src_dir, "siputils.py"),
create_config("siptrinityconfig.py", os.path.join(src_dir, "siputils.py"),
macros)
# Create the Makefiles.

2
sipgen/gencode.c
Unescape View File

@ -496,7 +496,7 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
"#define _%sAPI_H\n"
"\n"
"\n"
"#include <sip.h>\n"
"#include <sip-trinity.h>\n"
, mname
, mname);

2
sipgen/sipgen.sbf
Unescape View File

@ -14,6 +14,6 @@
# SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
target = sip
target = sip-trinity
sources = main.c transform.c gencode.c export.c heap.c parser.c lexer.c
headers = sip.h parser.h

2
siplib/apiversions.c
Unescape View File

@ -21,7 +21,7 @@
#include <string.h>
#include "sip.h"
#include "sip-trinity.h"
#include "sipint.h"

2
siplib/descriptors.c
Unescape View File

@ -19,7 +19,7 @@
#include <Python.h>
#include "sip.h"
#include "sip-trinity.h"
#include "sipint.h"

2
siplib/objmap.c
Unescape View File

@ -20,7 +20,7 @@
#include <string.h>
#include "sip.h"
#include "sip-trinity.h"
#include "sipint.h"

0
siplib/sip.h → siplib/sip-trinity.h
Unescape View File

2
siplib/siplib.c
Unescape View File

@ -25,7 +25,7 @@
#include <stddef.h>
#include <string.h>
#include "sip.h"
#include "sip-trinity.h"
#include "sipint.h"

2
siplib/siplib.sbf
Unescape View File

@ -16,4 +16,4 @@
target = sip
sources = siplib.c apiversions.c descriptors.c tqtlib.c threads.c objmap.c voidptr.c bool.cpp
headers = sip.h sipint.h
headers = sip-trinity.h sipint.h

2
siplib/threads.c
Unescape View File

@ -19,7 +19,7 @@
*/
#include "sip.h"
#include "sip-trinity.h"
#include "sipint.h"

2
siplib/tqtlib.c
Unescape View File

@ -22,7 +22,7 @@
#include <assert.h>
#include <string.h>
#include "sip.h"
#include "sip-trinity.h"
#include "sipint.h"

2
siplib/voidptr.c
Unescape View File

@ -21,7 +21,7 @@
#include <stddef.h>
#include "sip.h"
#include "sip-trinity.h"
#include "sipint.h"

12
sipdistutils.py → siptrinitydistutils.py
Unescape View File

@ -53,21 +53,21 @@ class build_ext (build_ext_base):
raise RuntimeError("cannot parse SIP-generated '%s'" % sbf)
def _find_sip(self):
import sipconfig
cfg = sipconfig.Configuration()
import siptrinityconfig
cfg = siptrinityconfig.Configuration()
if os.name == "nt":
if not os.path.splitext(os.path.basename(cfg.sip_bin))[1]:
return cfg.sip_bin + ".exe"
return cfg.sip_bin
def _sip_inc_dir(self):
import sipconfig
cfg = sipconfig.Configuration()
import siptrinityconfig
cfg = siptrinityconfig.Configuration()
return cfg.sip_inc_dir
def _sip_sipfiles_dir(self):
import sipconfig
cfg = sipconfig.Configuration()
import siptrinityconfig
cfg = siptrinityconfig.Configuration()
return cfg.default_sip_dir
def _sip_calc_signature(self):

2
siputils.py
Unescape View File

@ -1505,7 +1505,7 @@ class ModuleMakefile(Makefile):
if not ext:
ext = self.optional_string("EXTENSION_SHLIB", "so")
mfile.write("TARGET = %s\n" % (self._target + "." + ext))
mfile.write("TARGET = %s\n" % (self._target + "-trinity." + ext))
mfile.write("OFILES = %s\n" % self._build["objects"])
mfile.write("HFILES = %s %s\n" % (self._build["headers"], self._build["tqmoc_headers"]))
mfile.write("\n")

81
specs/freebsd-clang
Unescape View File

@ -0,0 +1,81 @@
#
#
# qmake configuration for freebsd-clang
#
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
CONFIG += qt warn_on release thread link_prl
QMAKE_CC = clang
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
QMAKE_YACCFLAGS = -d
QMAKE_CFLAGS = -pipe -fvisibility=hidden
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
QMAKE_CFLAGS_RELEASE = -O2
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
QMAKE_CXX = clang++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fvisibility-inlines-hidden
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
# Addon software goes into /usr/local on the BSDs, by default we will look there
QMAKE_INCDIR = /usr/local/include
QMAKE_LIBDIR = /usr/local/lib
QMAKE_INCDIR_X11 = /usr/X11R6/include
QMAKE_LIBDIR_X11 = /usr/X11R6/lib
QMAKE_INCDIR_TQT = $(TQTDIR)/include
QMAKE_LIBDIR_TQT = $(TQTDIR)/lib
QMAKE_INCDIR_OPENGL = /usr/X11R6/include
QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
QMAKE_LINK = clang++
QMAKE_LINK_SHLIB = clang++
QMAKE_LFLAGS =
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_SHLIB = -shared
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD = -pthread
QMAKE_RPATH = -Wl,-rpath,
QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_QT = -lqt
QMAKE_LIBS_QT_THREAD = -ltqt-mt
QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
QMAKE_LIBS_THREAD =
QMAKE_MOC = $(TQTDIR)/bin/tqmoc
QMAKE_UIC = $(TQTDIR)/bin/tquic
QMAKE_AR = ar cqs
QMAKE_RANLIB =
QMAKE_TAR = tar -cf
QMAKE_GZIP = gzip -9f
QMAKE_COPY = cp -f
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
Write Preview
Loading…
Cancel
Save