Updated installer and build scripts; Some shared libs are now included in installer

This commit is contained in:
Tony George 2014-10-14 21:43:00 +05:30
parent 759257bd0a
commit 9015b3bce1
6 changed files with 49 additions and 39 deletions

View File

@ -1,5 +1,11 @@
#!/bin/bash
app_name='timeshift'
app_fullname='Timeshift RSYNC'
tgz="../../pbuilder/"
dsc="../../builds/${app_name}*.dsc"
libs="../../libs"
backup=`pwd`
DIR="$( cd "$( dirname "$0" )" && pwd )"
cd $DIR
@ -9,9 +15,6 @@ cd installer
echo "Building installer..."
tgz="../../pbuilder/"
dsc="../../builds/timeshift*.dsc"
chmod u+x ./install.sh
# build installer -------------------------------------
@ -31,11 +34,15 @@ if [ $? -ne 0 ]; then
exit 1
fi
dpkg-deb -x ${arch}/timeshift*.deb ${arch}/extracted
dpkg-deb -x ${arch}/${app_name}*.deb ${arch}/extracted
cp -p --no-preserve=ownership -t ${arch}/extracted ./install.sh
cp -p --no-preserve=ownership -t ${arch}/extracted/usr/share/${app_name}/libs ${libs}/${arch}/libgee.so.2
cp -p --no-preserve=ownership -t ${arch}/extracted/usr/share/${app_name}/libs ${libs}/${arch}/libgudev-1.0.so.0
cp -p --no-preserve=ownership -t ${arch}/extracted/usr/share/${app_name}/libs ${libs}/${arch}/libjson-glib-1.0.so.0
chmod --recursive 0755 ${arch}/extracted/usr/share/${app_name}
makeself ${arch}/extracted ./timeshift-latest-${arch}.run "TimeShift (${arch})" ./install.sh
makeself ${arch}/extracted ./${app_name}-latest-${arch}.run "${app_fullname} (${arch})" ./install.sh
#check for errors
if [ $? -ne 0 ]; then
@ -44,7 +51,7 @@ if [ $? -ne 0 ]; then
exit 1
fi
cp -p --no-preserve=ownership ./${arch}/timeshift*.deb ./timeshift-latest-${arch}.deb
cp -p --no-preserve=ownership ./${arch}/${app_name}*.deb ./${app_name}-latest-${arch}.deb
done

4
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: timeshift
Section: utils
Priority: extra
Maintainer: Tony George <tony.george.kol@gmail.com>
Build-Depends: debhelper (>= 8.0.0), autotools-dev, valac, libgtk-3-dev, libgee-dev, libgudev-1.0-dev, libsoup2.4-dev, libjson-glib-dev
Build-Depends: debhelper (>= 8.0.0), autotools-dev, valac, libgtk-3-dev, libgee-dev, libgudev-1.0-dev, libjson-glib-dev
Standards-Version: 3.9.3
Homepage: http://teejeetech.blogspot.in/
#Vcs-Git: git://git.debian.org/collab-maint/hello.git
@ -10,7 +10,7 @@ Homepage: http://teejeetech.blogspot.in/
Package: timeshift
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-0, libgee2, libgudev-1.0-0, rsync, gksu, libblkid1
Depends: ${shlibs:Depends}, ${misc:Depends}, rsync, libblkid1
#Recommends:
Description: A system restore utility for Linux
TimeShift is a system restore utility which takes snapshots

View File

@ -3,10 +3,10 @@
app_name='timeshift'
app_fullname='Timeshift'
generic_depends=(rsync libgee json-glib)
debian_depends=(rsync libgee2 libjson-glib-1.0-0 gksu libblkid1)
redhat_depends=(rsync libgee json-glib)
arch_depends=(rsync libgee06 json-glib)
generic_depends=(rsync)
debian_depends=(rsync)
redhat_depends=(rsync)
arch_depends=(rsync)
generic_recommends=()
debian_recommends=()

View File

@ -6,16 +6,18 @@ launcherdir=$(sharedir)/applications
mandir=$(sharedir)/man
man1dir=$(mandir)/man1
CFLAGS=--std=c99
app_name=timeshift
app_fullname=Timeshift
all:
#build binaries
valac -X -D'GETTEXT_PACKAGE="timeshift"' --Xcc="-lm" --thread "Main.vala" "Utility.vala" "MainWindow.vala" "SettingsWindow.vala" "RestoreWindow.vala" "ExcludeMessageWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o timeshift --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-1.0 --pkg libsoup-2.4 --pkg json-glib-1.0 --pkg gudev-1.0
valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs --thread "Main.vala" "Utility.vala" "MainWindow.vala" "SettingsWindow.vala" "RestoreWindow.vala" "ExcludeMessageWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-1.0 --pkg libsoup-2.4 --pkg json-glib-1.0 --pkg gudev-1.0
#update translation template
xgettext --language=C --keyword=_ --copyright-holder='Tony George (teejee2008@gmail.com)' --package-name='timeshift' --package-version='1.6' --msgid-bugs-address='teejee2008@gmail.com' --escape --sort-output -o ../timeshift.pot *.vala
xgettext --language=C --keyword=_ --copyright-holder='Tony George (teejee2008@gmail.com)' --package-name="${app_name}" --package-version='1.6' --msgid-bugs-address='teejee2008@gmail.com' --escape --sort-output -o ../${app_name}.pot *.vala
clean:
rm -rf *.o timeshift
rm -rf *.o ${app_name}
install:
mkdir -p "$(DESTDIR)$(bindir)"
@ -23,47 +25,47 @@ install:
mkdir -p "$(DESTDIR)$(mandir)"
mkdir -p "$(DESTDIR)$(man1dir)"
mkdir -p "$(DESTDIR)$(launcherdir)"
mkdir -p "$(DESTDIR)$(sharedir)/timeshift"
mkdir -p "$(DESTDIR)$(sharedir)/${app_name}"
mkdir -p "$(DESTDIR)$(sharedir)/pixmaps"
mkdir -p "$(DESTDIR)$(localedir)/it_IT/LC_MESSAGES"
mkdir -p "$(DESTDIR)$(localedir)/ko_KR/LC_MESSAGES"
mkdir -p "$(DESTDIR)$(localedir)/fr_FR/LC_MESSAGES"
#binary
install -m 0755 timeshift "$(DESTDIR)$(bindir)"
install -m 0755 timeshift-uninstall "$(DESTDIR)$(bindir)"
install -m 0755 timeshift-launcher "$(DESTDIR)$(bindir)"
install -m 0755 ${app_name} "$(DESTDIR)$(bindir)"
install -m 0755 ${app_name}-uninstall "$(DESTDIR)$(bindir)"
install -m 0755 ${app_name}-launcher "$(DESTDIR)$(bindir)"
#shared files
cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/timeshift" ./share/timeshift/*
chmod --recursive 0755 $(DESTDIR)$(sharedir)/timeshift/*
cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/*
chmod --recursive 0755 $(DESTDIR)$(sharedir)/${app_name}/*
#launcher
install -m 0755 timeshift.desktop "$(DESTDIR)$(launcherdir)"
install -m 0755 ${app_name}.desktop "$(DESTDIR)$(launcherdir)"
#app icon
install -m 0755 ./share/pixmaps/timeshift.png "$(DESTDIR)$(sharedir)/pixmaps/"
install -m 0755 ./share/pixmaps/${app_name}.png "$(DESTDIR)$(sharedir)/pixmaps/"
#translations
msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/it_IT/LC_MESSAGES/timeshift.mo" ../po/timeshift-it.po
msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/ko_KR/LC_MESSAGES/timeshift.mo" ../po/timeshift-ko.po
msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/fr_FR/LC_MESSAGES/timeshift.mo" ../po/timeshift-fr.po
msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/it_IT/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-it.po
msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/ko_KR/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-ko.po
msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/fr_FR/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-fr.po
uninstall:
#binary
rm -f "$(DESTDIR)$(bindir)/timeshift"
rm -f "$(DESTDIR)$(bindir)/timeshift-uninstall"
rm -f "$(DESTDIR)$(bindir)/timeshift-launcher"
rm -f "$(DESTDIR)$(bindir)/${app_name}"
rm -f "$(DESTDIR)$(bindir)/${app_name}-uninstall"
rm -f "$(DESTDIR)$(bindir)/${app_name}-launcher"
#shared files
rm -rf "$(DESTDIR)$(sharedir)/timeshift"
rm -rf "$(DESTDIR)$(sharedir)/${app_name}"
#launcher
rm -f "$(DESTDIR)$(launcherdir)/timeshift.desktop"
rm -f "$(DESTDIR)$(launcherdir)/${app_name}.desktop"
#app icon
rm -f "$(DESTDIR)$(sharedir)/pixmaps/timeshift.png"
rm -f "$(DESTDIR)$(sharedir)/pixmaps/${app_name}.png"
#translations
rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/timeshift.mo
rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/${app_name}.mo

View File

@ -17,19 +17,20 @@ long_line_behaviour=1
long_line_column=80
[files]
current_page=0
FILE_NAME_0=1346;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMain.vala;0;4
current_page=8
FILE_NAME_0=22949;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMain.vala;0;4
FILE_NAME_1=904;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMainWindow.vala;0;4
FILE_NAME_2=22134;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FRestoreWindow.vala;0;4
FILE_NAME_3=913;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FSettingsWindow.vala;0;4
FILE_NAME_3=844;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FSettingsWindow.vala;0;4
FILE_NAME_4=34798;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FUtility.vala;0;4
FILE_NAME_5=2316;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Finstaller%2Finstall.sh;0;4
FILE_NAME_5=13;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Finstaller%2Finstall.sh;0;4
FILE_NAME_6=0;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FAboutWindow.vala;0;4
FILE_NAME_7=2333;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FDonationWindow.vala;0;4
FILE_NAME_8=571;Make;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Fmakefile;0;4
FILE_NAME_8=1394;Make;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Fmakefile;0;4
FILE_NAME_9=409;None;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fdebian%2Fchangelog;0;4
FILE_NAME_10=348;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FExcludeMessageWindow.vala;0;4
FILE_NAME_11=845;Conf;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fdebian%2Fcontrol;0;4
FILE_NAME_12=1216;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fbuild-installer.sh;0;4
[VTE]
last_dir=/home/teejee

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: timeshift 1.6\n"
"Report-Msgid-Bugs-To: teejee2008@gmail.com\n"
"POT-Creation-Date: 2014-10-14 08:43+0530\n"
"POT-Creation-Date: 2014-10-14 21:42+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"