diff options
Diffstat (limited to 'siputils.py')
| -rw-r--r-- | siputils.py | 104 |
1 files changed, 7 insertions, 97 deletions
diff --git a/siputils.py b/siputils.py index e73e2f2..879a7eb 100644 --- a/siputils.py +++ b/siputils.py @@ -421,16 +421,6 @@ class Makefile: py_lib = "python%u%u" % ((self.config.py_version >> 16), ((self.config.py_version >> 8) & 0xff)) - # For Borland use the OMF version of the Python library if it - # exists, otherwise assume that Python was built with Borland - # and use the normal library. - if self.generator == "BMAKE": - bpy_lib = py_lib + "_bcpp" - bpy_lib_path = os.path.join(self.config.py_lib_dir, self.platform_lib(bpy_lib)) - - if os.access(bpy_lib_path, os.F_OK): - py_lib = bpy_lib - if self._debug: py_lib = py_lib + "_d" @@ -440,7 +430,7 @@ class Makefile: libs.append(self.platform_lib(py_lib)) - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): + if self.generator in ("MSVC", "MSVC.NET"): if win_exceptions: cflags_exceptions = "CFLAGS_EXCEPTIONS_ON" cxxflags_exceptions = "CXXFLAGS_EXCEPTIONS_ON" @@ -494,7 +484,7 @@ class Makefile: cxxflags_debug = "CXXFLAGS_RELEASE" lflags_debug = "LFLAGS_RELEASE" - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): + if self.generator in ("MSVC", "MSVC.NET"): if self._threaded: cflags.extend(self.optional_list(cflags_mt)) cxxflags.extend(self.optional_list(cxxflags_mt)) @@ -540,7 +530,7 @@ class Makefile: # Windows needs the version number appended if TQt is a DLL. tqt_lib = self.config.tqt_lib - if self.generator in ("MSVC", "MSVC.NET", "BMAKE") and win_shared: + if self.generator in ("MSVC", "MSVC.NET") and win_shared: tqt_lib = tqt_lib + version_to_string(self.config.tqt_version).replace(".", "") if self.config.tqt_edition == "non-commercial": @@ -664,7 +654,7 @@ class Makefile: clib is the library name in cannonical form. """ - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): + if self.generator in ("MSVC", "MSVC.NET"): plib = clib + ".lib" else: plib = "-l" + clib @@ -679,7 +669,7 @@ class Makefile: """ prl_libs = [] - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): + if self.generator in ("MSVC", "MSVC.NET"): prl_name = os.path.join(self.config.tqt_lib_dir, clib + ".prl") else: prl_name = os.path.join(self.config.tqt_lib_dir, "lib" + clib + ".prl") @@ -765,7 +755,7 @@ class Makefile: bdict[i] = "" # Generate the list of objects. - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): + if self.generator in ("MSVC", "MSVC.NET"): ext = ".obj" else: ext = ".o" @@ -938,23 +928,6 @@ class Makefile: \t$< << """) - elif self.generator == "BMAKE": - mfile.write(""" -.cpp.obj: -\t$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o$@ $< - -.cc.obj: -\t$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o$@ $< - -.cxx.obj: -\t$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o$@ $< - -.C.obj: -\t$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o$@ $< - -.c.obj: -\t$(CC) -c $(CFLAGS) $(CPPFLAGS) -o$@ $< -""") else: mfile.write(""" .cpp.o: @@ -1353,7 +1326,7 @@ class ModuleMakefile(Makefile): mfile.write("\n") if self.static: - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): + if self.generator in ("MSVC", "MSVC.NET"): mfile.write("LIB = %s\n" % self.required_string("LIB")) elif self.generator == "MINGW": mfile.write("AR = %s\n" % self.required_string("LIB")) @@ -1399,33 +1372,6 @@ class ModuleMakefile(Makefile): if self._manifest: mfile.write("\tmt -nologo -manifest $(TARGET).manifest -outputresource:$(TARGET);2\n") - elif self.generator == "BMAKE": - if self.static: - mfile.write("\t-%s $(TARGET)\n" % (self.rm)) - mfile.write("\t$(LIB) $(TARGET) @&&|\n") - - for of in self._build["objects"].split(): - mfile.write("+%s \\\n" % (of)) - - mfile.write("|\n") - else: - mfile.write("\t$(LINK) @&&|\n") - mfile.write("\t$(LFLAGS) $(OFILES) ,$(TARGET),,$(LIBS),%s\n" % (self._target)) - mfile.write("|\n") - - # Create the .def file that renames the entry point. - defname = os.path.join(self.dir, self._target + ".def") - - try: - dfile = open(defname, "w") - except IOError: - error("Unable to create \"%s\"" % defname) - - dfile.write("EXPORTS\n") - dfile.write("%s=_%s\n" % (self._entry_point, self._entry_point)) - - dfile.close() - else: if self.static: mfile.write("\t-%s $(TARGET)\n" % self.rm) @@ -1565,17 +1511,10 @@ class ProgramMakefile(Makefile): build.extend(self.optional_list("CXXFLAGS")) - # Borland requires all flags to precede all file names. - if self.generator != "BMAKE": - build.append(source) - if self.generator in ("MSVC", "MSVC.NET"): build.append("-Fe") build.append("/link") libdir_prefix = "/LIBPATH:" - elif self.generator == "BMAKE": - build.append("-e" + exe) - libdir_prefix = "-L" else: build.append("-o") build.append(exe) @@ -1586,34 +1525,9 @@ class ProgramMakefile(Makefile): lflags = self.optional_list("LFLAGS") - # This is a huge hack demonstrating my lack of understanding of how the - # Borland compiler works. - if self.generator == "BMAKE": - blflags = [] - - for lf in lflags: - for f in lf.split(): - # Tell the compiler to pass the flags to the linker. - if f[-1] == "-": - f = "-l-" + f[1:-1] - elif f[0] == "-": - f = "-l" + f[1:] - - # Remove any explicit object files otherwise the compiler - # will complain that they can't be found, but they don't - # seem to be needed. - if f[-4:].lower() != ".obj": - blflags.append(f) - - lflags = blflags - build.extend(lflags) - build.extend(self.optional_list("LIBS")) - if self.generator == "BMAKE": - build.append(source) - return (exe, ' '.join(build)) def finalise(self): @@ -1680,10 +1594,6 @@ class ProgramMakefile(Makefile): mfile.write("\t$(LINK) $(LFLAGS) /OUT:$(TARGET) @<<\n") mfile.write("\t $(OFILES) $(LIBS)\n") mfile.write("<<\n") - elif self.generator == "BMAKE": - mfile.write("\t$(LINK) @&&|\n") - mfile.write("\t$(LFLAGS) $(OFILES) ,$(TARGET),,$(LIBS),,\n") - mfile.write("|\n") else: mfile.write("\t$(LINK) $(LFLAGS) -o $(TARGET) $(OFILES) $(LIBS)\n") |