equal
deleted
inserted
replaced
68 SymbianAbldMakefileGenerator::SymbianAbldMakefileGenerator() : SymbianMakefileGenerator() { } |
68 SymbianAbldMakefileGenerator::SymbianAbldMakefileGenerator() : SymbianMakefileGenerator() { } |
69 SymbianAbldMakefileGenerator::~SymbianAbldMakefileGenerator() { } |
69 SymbianAbldMakefileGenerator::~SymbianAbldMakefileGenerator() { } |
70 |
70 |
71 void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly) |
71 void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly) |
72 { |
72 { |
73 QString gnuMakefileName = QLatin1String("Makefile_") + uid3; |
|
74 removeEpocSpecialCharacters(gnuMakefileName); |
|
75 gnuMakefileName.append(".mk"); |
|
76 |
|
77 QFile ft(gnuMakefileName); |
73 QFile ft(gnuMakefileName); |
78 if (ft.open(QIODevice::WriteOnly)) { |
74 if (ft.open(QIODevice::WriteOnly)) { |
79 generatedFiles << ft.fileName(); |
75 generatedFiles << ft.fileName(); |
80 QTextStream t(&ft); |
76 QTextStream t(&ft); |
81 |
77 |
337 if (!isPrimaryMakefile) { |
333 if (!isPrimaryMakefile) { |
338 t << "all:" << endl; |
334 t << "all:" << endl; |
339 } else { |
335 } else { |
340 t << "all: debug release" << endl; |
336 t << "all: debug release" << endl; |
341 t << endl; |
337 t << endl; |
|
338 |
|
339 QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs(); |
|
340 |
342 t << "qmake:" << endl; |
341 t << "qmake:" << endl; |
343 t << "\t$(QMAKE) -spec symbian-abld -o \"" << fileInfo(Option::output.fileName()).fileName() |
342 t << qmakeCmd << endl; |
344 << "\" \"" << project->projectFile() << "\"" << endl; |
343 t << endl; |
345 t << endl; |
344 |
346 t << BLD_INF_FILENAME ":" << endl; |
345 t << BLD_INF_FILENAME ": " << project->projectFile() << endl; |
347 t << "\t$(QMAKE)" << endl; |
346 t << qmakeCmd << endl; |
348 t << endl; |
347 t << endl; |
|
348 |
349 t << "$(ABLD): " BLD_INF_FILENAME << endl; |
349 t << "$(ABLD): " BLD_INF_FILENAME << endl; |
350 t << "\tbldmake bldfiles" << endl; |
350 t << "\tbldmake bldfiles" << endl; |
351 t << endl; |
351 t << endl; |
352 |
352 |
353 t << "debug: $(ABLD)" << endl; |
353 t << "debug: $(ABLD)" << endl; |
555 void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension) |
555 void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension) |
556 { |
556 { |
557 // Normally emulator deployment gets done via regular makefile, but since subdirs |
557 // Normally emulator deployment gets done via regular makefile, but since subdirs |
558 // do not get that, special deployment only makefile is generated for them if needed. |
558 // do not get that, special deployment only makefile is generated for them if needed. |
559 if (targetType != TypeSubdirs || addDeploymentExtension) { |
559 if (targetType != TypeSubdirs || addDeploymentExtension) { |
560 QString gnuMakefileName = QLatin1String("Makefile_") + uid3; |
560 gnuMakefileName = QLatin1String("Makefile_") + fileInfo(mmpFileName).completeBaseName() |
561 removeEpocSpecialCharacters(gnuMakefileName); |
561 + QLatin1String(".mk"); |
562 gnuMakefileName.append(".mk"); |
|
563 t << "gnumakefile " << gnuMakefileName << endl; |
562 t << "gnumakefile " << gnuMakefileName << endl; |
564 } |
563 } |
565 } |
564 } |
566 |
565 |
567 void SymbianAbldMakefileGenerator::appendAbldTempDirs(QStringList& sysincspaths, QString includepath) |
566 void SymbianAbldMakefileGenerator::appendAbldTempDirs(QStringList& sysincspaths, QString includepath) |