diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-03-09 17:16:32 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-03-09 17:16:32 +0200 |
commit | 6e6ac02eaf265c6688c528175bce71ea45549ca7 (patch) | |
tree | 4f1436e628289ac43b950be8a73c64ac5382e730 /dependencies.py | |
parent | 3f46cd7fb30e3a478c44cac565d2ae12c72a0c25 (diff) | |
download | meson-6e6ac02eaf265c6688c528175bce71ea45549ca7.zip meson-6e6ac02eaf265c6688c528175bce71ea45549ca7.tar.gz meson-6e6ac02eaf265c6688c528175bce71ea45549ca7.tar.bz2 |
Major refactoring to move Qt5 from core into a module. Rules are written but moc/uic/rrc are not generated yet.
Diffstat (limited to 'dependencies.py')
-rw-r--r-- | dependencies.py | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/dependencies.py b/dependencies.py index 2779240..2f3cf6c 100644 --- a/dependencies.py +++ b/dependencies.py @@ -21,7 +21,6 @@ import os, stat, glob, subprocess, shutil from coredata import MesonException -import environment import mlog import mesonlib @@ -58,11 +57,6 @@ class Dependency(): def get_name(self): return self.name - # Rules for commands to execute before compilation - # such as Qt's moc preprocessor. - def get_generate_rules(self): - return [] - def get_exe_args(self): return [] @@ -664,21 +658,6 @@ class Qt5Dependency(Dependency): return False return True - def get_generate_rules(self): - moc_rule = CustomRule(self.moc.get_command() + ['$mocargs', '@INFILE@', '-o', '@OUTFILE@'], - 'moc_@BASENAME@.cpp', 'moc_headers', 'moc_hdr_compile', - 'Compiling header @INFILE@ with the moc preprocessor') - mocsrc_rule = CustomRule(self.moc.get_command() + ['$mocargs', '@INFILE@', '-o', '@OUTFILE@'], - '@BASENAME@.moc', 'moc_sources', 'moc_src_compile', - 'Compiling source @INFILE@ with the moc preprocessor') - ui_rule = CustomRule(self.uic.get_command() + ['@INFILE@', '-o', '@OUTFILE@'], - 'ui_@BASENAME@.h', 'ui_files', 'ui_compile', - 'Compiling @INFILE@ with the ui compiler') - rrc_rule = CustomRule(self.rcc.get_command() + ['@INFILE@', '-o', '@OUTFILE@', - '${rcc_args}'], '@BASENAME@.cpp','qresources', - 'rc_compile', 'Compiling @INFILE@ with the rrc compiler') - return [moc_rule, mocsrc_rule, ui_rule, rrc_rule] - def get_exe_args(self): # Qt5 seems to require this always. # Fix this to be more portable, especially to MSVC. |