summaryrefslogtreecommitdiff
path: root/qmake/main.cpp
Side-by-side diff
Diffstat (limited to 'qmake/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/main.cpp53
1 files changed, 39 insertions, 14 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp
index cc2d08a..a731314 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -1,14 +1,12 @@
/****************************************************************************
-** $Id$
+**
**
-** Definition of ________ class.
+** ???
**
-** Created : 970521
+** Copyright (C) 1992-2003 Trolltech AS. All rights reserved.
**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
-**
-** This file is part of the network module of the Qt GUI Toolkit.
+** This file is part of qmake.
**
** This file may be distributed under the terms of the Q Public License
** as defined by Trolltech AS of Norway and appearing in the file
** LICENSE.QPL included in the packaging of this file.
@@ -35,8 +33,9 @@
**
**********************************************************************/
#include "project.h"
+#include "property.h"
#include "option.h"
#include "makefile.h"
#include <qnamespace.h>
#include <qregexp.h>
@@ -49,8 +48,12 @@
#include <sys/stat.h>
// for Borland, main is defined to qMain which breaks qmake
#undef main
+#ifdef Q_OS_MAC
+// for qurl
+bool qt_resolve_symlinks = FALSE;
+#endif
int main(int argc, char **argv)
{
/* parse command line */
@@ -58,17 +61,38 @@ int main(int argc, char **argv)
return 666;
QDir sunworkshop42workaround = QDir::current();
QString oldpwd = sunworkshop42workaround.currentDirPath();
- Option::output_dir = oldpwd; //for now this is the output dir
#ifdef Q_WS_WIN
- if ( !(Option::output_dir.length() == 3 && Option::output_dir[0].isLetter() && Option::output_dir.endsWith(":/") ) )
+ if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/") ) )
#endif
{
- if(Option::output_dir.right(1) != QString(QChar(QDir::separator())))
- Option::output_dir += QDir::separator();
+ if(oldpwd.right(1) != QString(QChar(QDir::separator())))
+ oldpwd += QDir::separator();
+ }
+ Option::output_dir = oldpwd; //for now this is the output dir
+
+ if(Option::output.name() != "-") {
+ QFileInfo fi(Option::output);
+ QString dir;
+ if(fi.isDir()) {
+ dir = fi.filePath();
+ } else {
+ QString tmp_dir = fi.dirPath();
+ if(!tmp_dir.isEmpty() && QFile::exists(tmp_dir))
+ dir = tmp_dir;
+ }
+ if(!dir.isNull() && dir != ".")
+ Option::output_dir = dir;
+ if(QDir::isRelativePath(Option::output_dir))
+ Option::output_dir.prepend(oldpwd);
}
- QMakeProject proj;
+
+ QMakeProperty prop;
+ if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY || Option::qmake_mode == Option::QMAKE_SET_PROPERTY)
+ return prop.exec() ? 0 : 101;
+
+ QMakeProject proj(&prop);
int exit_val = 0;
QStringList files;
if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)
files << "(*hack*)"; //we don't even use files, but we do the for() body once
@@ -76,17 +100,17 @@ int main(int argc, char **argv)
files = Option::mkfile::project_files;
for(QStringList::Iterator pfile = files.begin(); pfile != files.end(); pfile++) {
if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
Option::qmake_mode == Option::QMAKE_GENERATE_PRL) {
- QString fn = (*pfile);
+ QString fn = Option::fixPathToLocalOS((*pfile));
//setup pwd properly
debug_msg(1, "Resetting dir to: %s", oldpwd.latin1());
QDir::setCurrent(oldpwd); //reset the old pwd
int di = fn.findRev(Option::dir_sep);
if(di != -1) {
debug_msg(1, "Changing dir to: %s", fn.left(di).latin1());
- if(!QDir::setCurrent(fn.left(fn.findRev(Option::dir_sep))))
+ if(!QDir::setCurrent(fn.left(di)))
fprintf(stderr, "Cannot find directory: %s\n", fn.left(di).latin1());
fn = fn.right(fn.length() - di - 1);
}
@@ -122,8 +146,9 @@ int main(int argc, char **argv)
using_stdout = TRUE;
} else {
if(Option::output.name().isEmpty() && Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE)
Option::output.setName(proj.first("QMAKE_MAKEFILE"));
+ Option::output_dir = oldpwd;
if(!mkfile->openOutput(Option::output)) {
fprintf(stderr, "Failure to open file: %s\n",
Option::output.name().isEmpty() ? "(stdout)" : Option::output.name().latin1());
return 5;
@@ -148,9 +173,9 @@ int main(int argc, char **argv)
/* debugging */
if(Option::debug_level) {
QMap<QString, QStringList> &vars = proj.variables();
for(QMap<QString, QStringList>::Iterator it = vars.begin(); it != vars.end(); ++it) {
- if(it.key().left(1) != "." && !it.data().isEmpty())
+ if(!it.key().startsWith(".") && !it.data().isEmpty())
debug_msg(1, "%s === %s", it.key().latin1(), it.data().join(" :: ").latin1());
}
}
}