Fixed some bugs

preferencesAboutTextFull
shibakaneki 14 years ago
parent 804d643f14
commit 9f654cb590
  1. 3
      Sankore_3.1.pro
  2. 4
      release.macx.sh
  3. 0
      thirdparty/google-breakpad/r318/bin/macx/dump_syms
  4. 0
      thirdparty/refnum/dmgutil.pl
  5. 2
      thirdparty/xpdf/xpdf-3.02/xpdf/Makefile

@ -12,9 +12,6 @@ VERSION_PATCH = 00
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION = $$replace(VERSION, "\\.r", "")
SVN_VERSION = $$system(svnversion)
SVN_VERSION = $$replace(SVN_VERSION, "\\n", "")
LONG_VERSION = "$${VERSION}.$${SVN_VERSION}"
macx:OSX_VERSION = "$${VERSION} (r$${SVN_VERSION})"

@ -69,14 +69,14 @@ QMAKE_CMD="$QMAKE -spec macx-g++42"
$QMAKE_CMD
VERSION=`cat "$BUILD_DIR/version"`
if [ "$VERSION" = "" ]; then
if [ ! -f "$BUILD_DIR/version" ]; then
echo "version not found"
exit 1
else
LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`"
if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then
echo creating a tag with the version $VERSION
git tag -a "v$VERSION"
git tag -a "v$VERSION" -m "Generated setup for v$VERSION"
git push origin --tags
else
if [ "$1" != "escape" ] ; then

@ -26,7 +26,7 @@ LDFLAGS =
T1LIBS =
FTLIBS =
XLIBS = -lXt -lXp -lXext -lXpm -lSM -lICE -lX11
XLIBS = -lX11
SPLASHLIBS = -L$(SPLASHLIBDIR) -lsplash

Loading…
Cancel
Save