Commit 952afcdc authored by Olivier Cornu's avatar Olivier Cornu
Browse files

Cosmétique.

Utilise des espaces à la suite de la première tabulation pour obtenir un
alignement vertical correct, quelque soit la largeur de tabulation
configurée.
J'utilise 4 espaces/tab sur Eclipse (format python), et git en attend 8
(format C)...
parent 5e81ed9b
......@@ -29,31 +29,31 @@ FILES := AUTHORS COPYING NEWS pyromaths README setup.py MANIFEST.in src data
### MANIFESTS
#
# Base manifest (README, src/ and test/ auto-included):
MANIFEST := \
include AUTHORS COPYING NEWS \n\
exclude MANIFEST.in \n\
recursive-include data * \n\
MANIFEST := \
include AUTHORS COPYING NEWS \n\
exclude MANIFEST.in \n\
recursive-include data * \n
# Minimal install (i.e. without test/ dir):
MANIFEST-min := $(MANIFEST)\
prune test \n\
MANIFEST-min := $(MANIFEST) \
prune test \n
# Full project sources:
MANIFEST-all := $(MANIFEST)\
recursive-include debian * \n\
recursive-include utils * \n\
include Makefile \n\
MANIFEST-all := $(MANIFEST) \
recursive-include debian * \n\
recursive-include utils * \n\
include Makefile \n
# Unix:
MANIFEST-unix := $(MANIFEST-min)\
exclude data/images/pyromaths.icns \n\
exclude data/images/pyromaths.ico \n\
MANIFEST-unix := $(MANIFEST-min) \
exclude data/images/pyromaths.icns \n\
exclude data/images/pyromaths.ico \n
# Mac app:
MANIFEST-mac := $(MANIFEST-min)\
prune data/linux \n\
exclude data/images/pyromaths.ico \n\
exclude data/images/pyromaths-banniere.png \n\
MANIFEST-mac := $(MANIFEST-min) \
prune data/linux \n\
exclude data/images/pyromaths.ico \n\
exclude data/images/pyromaths-banniere.png \n
# Win app:
MANIFEST-win := $(MANIFEST-min)\
prune data/linux \n\
exclude data/images/pyromaths.icns \n\
MANIFEST-win := $(MANIFEST-min) \
prune data/linux \n\
exclude data/images/pyromaths.icns \n
### MACROS
#
......@@ -130,9 +130,9 @@ min: version
deb: min
# Make DEB archive
$(CLEAN)
cd $(BUILD) && tar -xjf pyromaths-$(VERSION).tar.bz2 &&\
mv pyromaths-$(VERSION).tar.bz2 pyromaths_$(VERSION).orig.tar.bz2 &&\
mv pyromaths-$(VERSION) $(BUILDIR)
cd $(BUILD) && tar -xjf pyromaths-$(VERSION).tar.bz2 &&\
mv pyromaths-$(VERSION) $(BUILDIR) &&\
mv pyromaths-$(VERSION).tar.bz2 pyromaths_$(VERSION).orig.tar.bz2
cp -r debian $(BUILDIR)
cd $(BUILDIR) && debuild clean $(OUT)
cd $(BUILDIR) && debuild -kB39EE5B6 $(OUT) || exit 0
......@@ -144,13 +144,13 @@ repo: deb
mkdir -p $(BUILDIR)/dists
cp $(DIST)/pyromaths_$(VERSION)*.deb $(BUILDIR)/dists
cd $(BUILDIR) &&\
sudo dpkg-scanpackages . /dev/null > Packages &&\
sudo dpkg-scanpackages . /dev/null | gzip -c9 > Packages.gz &&\
sudo dpkg-scanpackages . /dev/null | bzip2 -c9 > Packages.bz2 &&\
apt-ftparchive release . > /tmp/Release.tmp &&\
mv /tmp/Release.tmp Release &&\
gpg --default-key "Jérôme Ortais" -bao Release.gpg Release &&\
tar vjcf $(ARCHIVE)/debs-$(VERSION).tar.bz2 dists/ Packages Packages.gz Packages.bz2 Release Release.gpg
sudo dpkg-scanpackages . /dev/null > Packages &&\
sudo dpkg-scanpackages . /dev/null | gzip -c9 > Packages.gz &&\
sudo dpkg-scanpackages . /dev/null | bzip2 -c9 > Packages.bz2 &&\
apt-ftparchive release . > /tmp/Release.tmp &&\
mv /tmp/Release.tmp Release &&\
gpg --default-key "Jérôme Ortais" -bao Release.gpg Release &&\
tar vjcf $(ARCHIVE)/debs-$(VERSION).tar.bz2 dists/ Packages Packages.gz Packages.bz2 Release Release.gpg
app: version
# Make standalone Mac application
......@@ -160,35 +160,35 @@ app: version
# ..Improve french localization..."
# ....Extract strings from qt_menu.nib
cd $(DIST) &&\
ibtool --generate-strings-file qt_menu.strings $APP/Frameworks/QtGui.framework/Versions/4/Resources/qt_menu.nib &&\
iconv -f utf-16 -t utf-8 qt_menu.strings > qt_menu_tmp.strings &&\
mv -f qt_menu_tmp.strings qt_menu.strings &&\
sed -i '' 's/Hide/Masquer/g' qt_menu.strings &&\
sed -i '' 's/Others/les autres/g' qt_menu.strings &&\
sed -i '' 's/Show All/Tout afficher/g' qt_menu.strings &&\
sed -i '' 's/Quit/Quitter/g' qt_menu.strings
ibtool --generate-strings-file qt_menu.strings $APP/Frameworks/QtGui.framework/Versions/4/Resources/qt_menu.nib &&\
iconv -f utf-16 -t utf-8 qt_menu.strings > qt_menu_tmp.strings &&\
mv -f qt_menu_tmp.strings qt_menu.strings &&\
sed -i '' 's/Hide/Masquer/g' qt_menu.strings &&\
sed -i '' 's/Others/les autres/g' qt_menu.strings &&\
sed -i '' 's/Show All/Tout afficher/g' qt_menu.strings &&\
sed -i '' 's/Quit/Quitter/g' qt_menu.strings
# ....Import french strings
cd $(APP)/Frameworks/QtGui.framework/Versions/4/Resources &&\
ibtool --strings-file $DIST/qt_menu.strings --write qt_menu_french.nib qt_menu.nib &&\
# ....Clean-up
rm -rf qt_menu.nib && mv qt_menu_french.nib qt_menu.nib
ibtool --strings-file $DIST/qt_menu.strings \
--write qt_menu_french.nib qt_menu.nib &&\
rm -rf qt_menu.nib && mv qt_menu_french.nib qt_menu.nib
rm $(DIST)/qt_menu.strings
# ..Clean-up unnecessary files/folders
rm -f $(APP)/PkgInfo
cd $(APP)/Resources && rm -rf include lib/python2.*/config lib/python2.*/site.pyc
cd $(APP)/Resources/lib/python2.*/lib-dynload &&\
rm -f _AE.so _codecs_cn.so _codecs_hk.so _codecs_iso2022.so \
_codecs_jp.so _codecs_kr.so _codecs_tw.so _Evt.so _File.so \
_hashlib.so _heapq.so _locale.so _multibytecodec.so _Res.so \
_ssl.so array.so bz2.so cPickle.so datetime.so gestalt.so \
MacOS.so pyexpat.so resource.so strop.so unicodedata.so \
PyQt4/Qt.so
rm -f _AE.so _codecs_cn.so _codecs_hk.so _codecs_iso2022.so \
_codecs_jp.so _codecs_kr.so _codecs_tw.so _Evt.so _File.so \
_hashlib.so _heapq.so _locale.so _multibytecodec.so _Res.so \
_ssl.so array.so bz2.so cPickle.so datetime.so gestalt.so \
MacOS.so pyexpat.so resource.so strop.so unicodedata.so \
PyQt4/Qt.so
cd $(APP)/Frameworks &&\
rm -rf *.framework/Contents *.framework/Versions/4.0 \
*.framework/Versions/Current *.framework/*.prl \
QtCore.framework/QtCore QtGui.framework/QtGui
rm -rf *.framework/Contents *.framework/Versions/4.0 \
*.framework/Versions/Current *.framework/*.prl \
QtCore.framework/QtCore QtGui.framework/QtGui
cd $(APP)/Frameworks/Python.framework/Versions/2.* &&\
rm -rf include lib Resources
rm -rf include lib Resources
# ..Remove all architectures but x86_64..."
ditto --rsrc --arch x86_64 --hfsCompression $(DIST)/Pyromaths.app $(DIST)/Pyromaths-x86_64.app
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment