From: Diane Trout Date: Wed, 29 Mar 2006 05:14:51 +0000 (+0000) Subject: ignore some generated product X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=84215ed370310536c9c5a8b56d4948f51311562d ignore some generated product there's no need to version control things we build. --- diff --git a/.boring b/.boring index 918a95a..4dd64d8 100644 --- a/.boring +++ b/.boring @@ -1,4 +1,5 @@ # Boring file regexps: +(^|/)unittests$ # doxygen output (^|/)doc/html($|/) (^|/)doc/latex($|/) @@ -6,7 +7,7 @@ \.d$ # qt moc_.*\.cpp$ -qrc_(^|/)*$ +qrc_.*\.cpp$ (^|/)mussagl.app($|/) # mussa specific thingies \.museq$ diff --git a/osxdist.py b/osxdist.py index b1e820a..383ed01 100644 --- a/osxdist.py +++ b/osxdist.py @@ -51,7 +51,7 @@ def main(args): framework_subpath = os.path.join("%(framework)s.framework", "Versions", "4.0", "%(framework)s") frameworks = ['QtCore', 'QtGui', 'QtOpenGL'] - qt_lib_dir="/usr/local/qt/4.1.0-shared/lib" + qt_lib_dir="/usr/local/qt-4.1.1/lib" qt_framework=os.path.join(qt_lib_dir, framework_subpath) app_name="mussagl"