diff options
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/borland_bmake.cpp | 27 | ||||
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 28 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_dsp.cpp | 59 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 27 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 86 |
5 files changed, 3 insertions, 224 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index 9d8dc7cb..aa0f7b43 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -207,23 +207,6 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) } } TQString targetfilename = project->variables()["TARGET"].first(); - if(project->isActiveConfig("activeqt")) { - TQString version = project->variables()["VERSION"].first(); - if ( version.isEmpty() ) - version = "1.0"; - - if ( project->isActiveConfig("dll")) { - t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); - t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); - } else { - t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); - t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(TARGET) -regserver"); - } - } t << endl << endl; if(!project->variables()["RC_FILE"].isEmpty()) { @@ -272,10 +255,6 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ",""); - if ( project->isActiveConfig("activeqt")) { - t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl"); - t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - } if(!project->isEmpty("IMAGES")) t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", ""); t << endl; @@ -503,12 +482,6 @@ BorlandMakefileGenerator::init() (*libit).replace(TQRegExp("qt(mt)?\\.lib"), ver); } } - if ( project->isActiveConfig( "activeqt" ) ) { - project->variables().remove("QMAKE_LIBS_QT_ENTRY"); - project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; - if ( project->isActiveConfig( "dll" ) ) - project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; - } if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; } diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 06952431..93557bc6 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -243,23 +243,6 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) } } TQString targetfilename = project->variables()["TARGET"].first(); - if(project->isActiveConfig("activeqt")) { - TQString version = project->variables()["VERSION"].first(); - if ( version.isEmpty() ) - version = "1.0"; - - if ( project->isActiveConfig("dll")) { - t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); - t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); - } else { - t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); - t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << "-$(TARGET) -regserver"; - } - } t << endl << endl; if(!project->variables()["RC_FILE"].isEmpty()) { @@ -291,10 +274,6 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) << "\n\t-$(DEL_FILE) $(TARGET)" << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ",""); - if ( project->isActiveConfig("activeqt")) { - t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl"); - t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - } if(!project->isEmpty("IMAGES")) t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", ""); @@ -519,13 +498,6 @@ MingwMakefileGenerator::init() (*libit).replace(TQRegExp("-lqt(-mt)?"), ver); } } - if ( project->isActiveConfig( "activeqt" ) ) { - project->variables().remove("QMAKE_LIBS_QT_ENTRY"); - project->variables()["QMAKE_LIBS_QT_ENTRY"] = "-lqaxserver"; - if ( project->isActiveConfig( "dll" ) ) { - project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; - } - } if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; } diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index 6b6b8fdb..e291718e 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -705,12 +705,6 @@ DspMakefileGenerator::init() (*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver); } } - if ( project->isActiveConfig( "activeqt" ) ) { - project->variables().remove("QMAKE_LIBS_QT_ENTRY"); - project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; - if ( project->isActiveConfig( "dll" ) ) - project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; - } if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; } @@ -926,12 +920,6 @@ DspMakefileGenerator::init() TQString dest; TQString postLinkStep; TQString copyDllStep; - TQString activeTQtStepPreCopyDll; - TQString activeTQtStepPostCopyDll; - TQString activeTQtStepPreCopyDllDebug; - TQString activeTQtStepPostCopyDllDebug; - TQString activeTQtStepPreCopyDllRelease; - TQString activeTQtStepPostCopyDllRelease; if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) postLinkStep += var("QMAKE_POST_LINK"); @@ -959,59 +947,18 @@ DspMakefileGenerator::init() } } - if ( project->isActiveConfig("activeqt") ) { - TQString idl = project->variables()["QMAKE_IDL"].first(); - TQString idc = project->variables()["QMAKE_IDC"].first(); - TQString version = project->variables()["VERSION"].first(); - if ( version.isEmpty() ) - version = "1.0"; - project->variables()["MSVCDSP_IDLSOURCES"].append( var("OBJECTS_DIR") + targetfilename + ".idl" ); - if ( project->isActiveConfig( "dll" ) ) { - activeTQtStepPreCopyDll += - "\t" + idc + " %1 -idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version + - "\t" + idl + " /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb" + - "\t" + idc + " %2 /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"; - activeTQtStepPostCopyDll += - "\t" + idc + " %1 /regserver\n"; - - TQString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".dll"; - activeTQtStepPreCopyDllRelease = activeTQtStepPreCopyDll.arg(executable).arg(executable); - activeTQtStepPostCopyDllRelease = activeTQtStepPostCopyDll.arg(executable); - - executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".dll"; - activeTQtStepPreCopyDllDebug = activeTQtStepPreCopyDll.arg(executable).arg(executable); - activeTQtStepPostCopyDllDebug = activeTQtStepPostCopyDll.arg(executable); - } else { - activeTQtStepPreCopyDll += - "\t%1 -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version + - "\t" + idl + " /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb" + - "\t" + idc + " %2 /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"; - activeTQtStepPostCopyDll += - "\t%1 -regserver\n"; - TQString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".exe"; - activeTQtStepPreCopyDllRelease = activeTQtStepPreCopyDll.arg(executable).arg(executable); - activeTQtStepPostCopyDllRelease = activeTQtStepPostCopyDll.arg(executable); - - executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".exe"; - activeTQtStepPreCopyDllDebug = activeTQtStepPreCopyDll.arg(executable).arg(executable); - activeTQtStepPostCopyDllDebug = activeTQtStepPostCopyDll.arg(executable); - } - - } - - - if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() || !activeTQtStepPreCopyDllDebug.isEmpty() || !activeTQtStepPreCopyDllRelease.isEmpty() ) { + if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() ) { project->variables()["MSVCDSP_POST_LINK_DBG"].append( "# Begin Special Build Tool\n" "SOURCE=$(InputPath)\n" "PostBuild_Desc=Post Build Step\n" - "PostBuild_Cmds=" + postLinkStep + activeTQtStepPreCopyDllDebug + copyDllStep + activeTQtStepPostCopyDllDebug + "\n" + "PostBuild_Cmds=" + postLinkStep + copyDllStep + "\n" "# End Special Build Tool\n" ); project->variables()["MSVCDSP_POST_LINK_REL"].append( "# Begin Special Build Tool\n" "SOURCE=$(InputPath)\n" "PostBuild_Desc=Post Build Step\n" - "PostBuild_Cmds=" + postLinkStep + activeTQtStepPreCopyDllRelease + copyDllStep + activeTQtStepPostCopyDllRelease + "\n" + "PostBuild_Cmds=" + postLinkStep + copyDllStep + "\n" "# End Special Build Tool\n" ); } diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index a1ada25f..8e313f23 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -274,23 +274,6 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) } } TQString targetfilename = project->variables()["TARGET"].first(); - if(project->isActiveConfig("activeqt")) { - TQString version = project->variables()["VERSION"].first(); - if ( version.isEmpty() ) - version = "1.0"; - - if ( project->isActiveConfig("dll")) { - t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); - t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); - } else { - t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); - t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << "-$(TARGET) -regserver"; - } - } t << endl << endl; if(!project->variables()["RC_FILE"].isEmpty()) { @@ -332,10 +315,6 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","\n") << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","\n"); - if ( project->isActiveConfig("activeqt")) { - t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl"); - t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - } if(!project->isEmpty("IMAGES")) t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", ""); t << endl; @@ -603,12 +582,6 @@ NmakeMakefileGenerator::init() (*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver); } } - if ( project->isActiveConfig( "activeqt" ) ) { - project->variables().remove("QMAKE_LIBS_QT_ENTRY"); - project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; - if ( project->isActiveConfig( "dll" ) ) - project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; - } if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; } diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 5eb30160..62374199 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -822,38 +822,6 @@ void VcprojGenerator::initPostBuildEventTools() RConf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC"); RConf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL"); } - if( project->isActiveConfig( "activeqt" ) ) { - TQString name = project->first( "QMAKE_ORIG_TARGET" ); - TQString nameext = project->first( "TARGET" ); - TQString objdir = project->first( "OBJECTS_DIR" ); - TQString idc = project->first( "QMAKE_IDC" ); - - RConf.postBuild.Description = "Finalizing ActiveTQt server..."; - if ( !RConf.postBuild.CommandLine.isEmpty() ) - RConf.postBuild.CommandLine += " && "; - - if( project->isActiveConfig( "dll" ) ) { // In process - RConf.postBuild.CommandLine += - // call idc to generate .idl file from .dll - idc + " "$(TargetPath)" -idl " + objdir + name + ".idl -version 1.0 && " + - // call midl to create implementations of the .idl file - project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " + - // call idc to replace tlb... - idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " + - // register server - idc + " "$(TargetPath)" /regserver"; - } else { // out of process - RConf.postBuild.CommandLine = - // call application to dump idl - ""$(TargetPath)" -dumpidl " + objdir + name + ".idl -version 1.0 && " + - // call midl to create implementations of the .idl file - project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " + - // call idc to replace tlb... - idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " + - // call app to register - ""$(TargetPath)" -regserver"; - } - } } void VcprojGenerator::initPreLinkEventTools() @@ -1177,13 +1145,6 @@ void VcprojGenerator::initOld() (*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver); } } - if ( project->isActiveConfig( "activeqt" ) ) { - project->variables().remove("QMAKE_LIBS_QT_ENTRY"); - project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; - if ( project->isActiveConfig( "dll" ) ) { - project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; - } - } if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; } @@ -1403,53 +1364,6 @@ void VcprojGenerator::initOld() project->variables()["MSVCPROJ_COPY_DLL_DESC"].append( deststr ); } - // ACTIVEQT ------------------------------------------------------ - if ( project->isActiveConfig("activeqt") ) { - TQString idl = project->variables()["QMAKE_IDL"].first(); - TQString idc = project->variables()["QMAKE_IDC"].first(); - TQString version = project->variables()["VERSION"].first(); - if ( version.isEmpty() ) - version = "1.0"; - - TQString objdir = project->first( "OBJECTS_DIR" ); - project->variables()["MSVCPROJ_IDLSOURCES"].append( objdir + targetfilename + ".idl" ); - if ( project->isActiveConfig( "dll" ) ) { - TQString regcmd = "# Begin Special Build Tool\n" - "TargetPath=" + targetfilename + "\n" - "SOURCE=$(InputPath)\n" - "PostBuild_Desc=Finalizing ActiveTQt server...\n" - "PostBuild_Cmds=" + - idc + " %1 -idl " + objdir + targetfilename + ".idl -version " + version + - "\t" + idl + " /nologo " + objdir + targetfilename + ".idl /tlb " + objdir + targetfilename + ".tlb" + - "\t" + idc + " %1 /tlb " + objdir + targetfilename + ".tlb" - "\tregsvr32 /s %1\n" - "# End Special Build Tool"; - - TQString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first(); - project->variables()["MSVCPROJ_COPY_DLL_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) ); - - executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first(); - project->variables()["MSVCPROJ_COPY_DLL_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) ); - } else { - TQString regcmd = "# Begin Special Build Tool\n" - "TargetPath=" + targetfilename + "\n" - "SOURCE=$(InputPath)\n" - "PostBuild_Desc=Finalizing ActiveTQt server...\n" - "PostBuild_Cmds=" - "%1 -dumpidl " + objdir + targetfilename + ".idl -version " + version + - "\t" + idl + " /nologo " + objdir + targetfilename + ".idl /tlb " + objdir + targetfilename + ".tlb" - "\t" + idc + " %1 /tlb " + objdir + targetfilename + ".tlb" - "\t%1 -regserver\n" - "# End Special Build Tool"; - - TQString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first(); - project->variables()["MSVCPROJ_REGSVR_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) ); - - executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first(); - project->variables()["MSVCPROJ_REGSVR_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) ); - } - } - if ( !project->variables()["DEF_FILE"].isEmpty() ) project->variables()["MSVCPROJ_LFLAGS"].append("/DEF:"+project->first("DEF_FILE")); |