From a1f23295ff095be2dbdeb2de2c32926a720ca0e7 Mon Sep 17 00:00:00 2001 From: Tony George Date: Sun, 15 Oct 2017 18:43:26 +0530 Subject: [PATCH] Updated build scripts --- .bzrignore | 17 +- .gitignore | 17 +- INSTALL | 373 +-------------------------- LICENSE.md | 166 ++++++++++++ THANKS => NOTES | 0 build-deb.sh | 39 ++- build-installers.sh | 33 +-- build-source.sh | 27 +- build-upload-ppa.sh | 39 --- {installer => release}/sanity.config | 0 src/makefile | 39 +-- test-cases | 25 -- 12 files changed, 260 insertions(+), 515 deletions(-) create mode 100644 LICENSE.md rename THANKS => NOTES (100%) delete mode 100755 build-upload-ppa.sh rename {installer => release}/sanity.config (100%) delete mode 100644 test-cases diff --git a/.bzrignore b/.bzrignore index 5572f90..c89766f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,11 +1,16 @@ src/timeshift src/timeshift-gtk -po/*.mo -installer/amd64 -installer/i386 -installer/*.deb -installer/*.run designs/ -.git/ +release/source +release/amd64 +release/i386 +release/armel +release/armhf +release/*.deb +release/*.run +*.geany +*.mo *.c *.o +.git +.bzr diff --git a/.gitignore b/.gitignore index 3c58d75..1b60a6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,16 @@ src/timeshift src/timeshift-gtk -po/*.mo -installer/amd64 -installer/i386 -installer/*.deb -installer/*.run designs/ -.bzr/ +release/source +release/amd64 +release/i386 +release/armel +release/armhf +release/*.deb +release/*.run +*.geany +*.mo *.c *.o +.bzr +.git diff --git a/INSTALL b/INSTALL index 6e90e07..0534b87 100644 --- a/INSTALL +++ b/INSTALL @@ -1,370 +1,5 @@ -Installation Instructions -************************* +# build +make all -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, -Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +# install +sudo make install diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..5f5ff16 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,166 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/THANKS b/NOTES similarity index 100% rename from THANKS rename to NOTES diff --git a/build-deb.sh b/build-deb.sh index 56d334f..d7d24a6 100755 --- a/build-deb.sh +++ b/build-deb.sh @@ -6,46 +6,43 @@ cd $DIR . ./BUILD_CONFIG -tgz="../../pbuilder/" -dsc="../../builds/${pkg_name}*.dsc" -libs="../../libs" - sh build-source.sh -cd installer +rm -fv release/${pkg_name}-*.deb -for arch in i386 amd64 -do +build_deb_for_dist() { + +dist=$1 +arch=$2 echo "" echo "==========================================================================" -echo " build-deb.sh : $arch" +echo " build-deb.sh : $dist-$arch" echo "==========================================================================" echo "" -rm -rfv ${arch} -mkdir -pv ${arch} +rm -rfv release/${arch} +mkdir -pv release/${arch} echo "-------------------------------------------------------------------------" -sudo pbuilder --build --buildresult ${arch} --basetgz "${tgz}base-${arch}.tgz" ${dsc} +pbuilder-dist $dist $arch build release/source/${pkg_name}*.dsc --buildresult release/$arch -#check for errors -if [ $? -ne 0 ]; then - cd "$backup"; echo "Failed"; exit 1; -fi +if [ $? -ne 0 ]; then cd "$backup"; echo "Failed"; exit 1; fi echo "--------------------------------------------------------------------------" -cp -pv --no-preserve=ownership ./${arch}/${pkg_name}*.deb ./${pkg_name}-v${pkg_version}-${arch}.deb +cp -pv --no-preserve=ownership release/${arch}/${pkg_name}*.deb release/${pkg_name}-v${pkg_version}-${arch}.deb -#check for errors -if [ $? -ne 0 ]; then - cd "$backup"; echo "Failed"; exit 1; -fi +if [ $? -ne 0 ]; then cd "$backup"; echo "Failed"; exit 1; fi echo "--------------------------------------------------------------------------" -done +} + +build_deb_for_dist xenial i386 +build_deb_for_dist xenial amd64 +#build_deb_for_dist stretch armel +#build_deb_for_dist stretch armhf cd "$backup" diff --git a/build-installers.sh b/build-installers.sh index 6cc8360..7b2fc71 100755 --- a/build-installers.sh +++ b/build-installers.sh @@ -6,19 +6,18 @@ cd $DIR . ./BUILD_CONFIG -rm -vf installer/*.run -rm -vf installer/*.deb +rm -vf release/*.run +rm -vf release/*.deb # build debs sh build-deb.sh -cd installer for arch in i386 amd64 do -rm -rfv ${arch}/files -mkdir -pv ${arch}/files +rm -rfv release/${arch}/files +mkdir -pv release/${arch}/files echo "" echo "==========================================================================" @@ -26,31 +25,25 @@ echo " build-installers.sh : $arch" echo "==========================================================================" echo "" -dpkg-deb -x ${arch}/${pkg_name}*.deb ${arch}/files +dpkg-deb -x release/${pkg_name}-v${pkg_version}-${arch}.deb release/${arch}/files -#check for errors -if [ $? -ne 0 ]; then - cd "$backup"; echo "Failed"; exit 1; -fi +if [ $? -ne 0 ]; then cd "$backup"; echo "Failed"; exit 1;fi echo "--------------------------------------------------------------------------" -rm -rfv ${arch}/${pkg_name}*.* # remove extra files -cp -pv --no-preserve=ownership ./sanity.config ./${arch}/sanity.config -sanity --generate --base-path ./${arch} --out-path . --arch ${arch} +rm -rfv release/${arch}/${pkg_name}*.* # remove source files created by pbuilder +cp -pv --no-preserve=ownership release/sanity.config release/${arch}/sanity.config +sanity --generate --base-path release/${arch} --out-path release --arch ${arch} -#check for errors -if [ $? -ne 0 ]; then - cd "$backup"; echo "Failed"; exit 1; -fi +if [ $? -ne 0 ]; then cd "$backup"; echo "Failed"; exit 1; fi -mv -v ./*${arch}.run ./${pkg_name}-v${pkg_version}-${arch}.run +mv -v release/*${arch}.run release/${pkg_name}-v${pkg_version}-${arch}.run echo "--------------------------------------------------------------------------" done -cp -vf *.run ../../PACKAGES/ -cp -vf *.deb ../../PACKAGES/ +cp -vf release/*.run ../PACKAGES/ +cp -vf release/*.deb ../PACKAGES/ cd "$backup" diff --git a/build-source.sh b/build-source.sh index 39d3c48..3b0c906 100755 --- a/build-source.sh +++ b/build-source.sh @@ -16,29 +16,30 @@ echo "app_name: $app_name" echo "pkg_name: $pkg_name" echo "--------------------------------------------------------------------------" -# commit to bzr repo -bzr add * -bzr commit -m "updated" +# clean build dir -#skip errors as commit may fail if no changes +rm -rfv /tmp/builds +mkdir -pv /tmp/builds + +make clean + +rm -rfv release/source +mkdir -pv release/source echo "--------------------------------------------------------------------------" -# clean build dir -rm -rf ../builds +# build source package +dpkg-source --build ./ -# build source -bzr builddeb --source --native --build-dir ../builds/temp --result-dir ../builds +mv -vf ../$pkg_name*.dsc release/source/ +mv -vf ../$pkg_name*.tar.xz release/source/ -#check for errors -if [ $? -ne 0 ]; then - cd "$backup"; echo "Failed"; exit 1; -fi +if [ $? -ne 0 ]; then cd "$backup"; echo "Failed"; exit 1; fi echo "--------------------------------------------------------------------------" # list files -ls -l ../builds +ls -l release/source echo "-------------------------------------------------------------------------" diff --git a/build-upload-ppa.sh b/build-upload-ppa.sh deleted file mode 100755 index bcc9982..0000000 --- a/build-upload-ppa.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -backup=`pwd` -DIR="$( cd "$( dirname "$0" )" && pwd )" -cd "$DIR" - -. ./BUILD_CONFIG - -echo "" -echo "==========================================================================" -echo " build-upload-ppa.sh" -echo "==========================================================================" -echo "" - -echo "app_name: $app_name" -echo "pkg_name: $pkg_name" -echo "--------------------------------------------------------------------------" - -# build source -debuild -S - -#check for errors -if [ $? -ne 0 ]; then - cd "$backup"; echo "Failed"; exit 1; -fi - -echo "--------------------------------------------------------------------------" - -# upload to launchpad -dput ppa:teejee2008/ppa ../timeshift_*_source.changes - -#check for errors -if [ $? -ne 0 ]; then - cd "$backup"; echo "Failed"; exit 1; -fi - -echo "-------------------------------------------------------------------------" - -cd "$backup" diff --git a/installer/sanity.config b/release/sanity.config similarity index 100% rename from installer/sanity.config rename to release/sanity.config diff --git a/src/makefile b/src/makefile index 2940843..d7704d8 100644 --- a/src/makefile +++ b/src/makefile @@ -1,3 +1,6 @@ +SHELL=/bin/bash +CFLAGS=--std=c99 + prefix=/usr sysconfdir=/etc bindir=$(prefix)/bin @@ -7,7 +10,7 @@ localedir=$(sharedir)/locale launcherdir=$(sharedir)/applications mandir=$(sharedir)/man man1dir=$(mandir)/man1 -CFLAGS=--std=c99 + app_name=timeshift app_fullname=Timeshift @@ -38,8 +41,11 @@ all: find . -iname "*.vala" | xargs xgettext --from-code=UTF-8 --language=C --keyword=_ --copyright-holder='Tony George (teejeetech@gmail.com)' --package-name="${app_name}" --package-version='1.6' --msgid-bugs-address='teejeetech@gmail.com' --escape --sort-output -o ../${app_name}.pot clean: - rm -rf *.o ${app_name} - + rm -rfv ../release/{source,i386,amd64,armel,armhf} + rm -rfv ../release/*.{run,deb} + rm -rfv *.c *.o *.mo + rm -fv ${app_name} ${app_name}-gtk + install: mkdir -p "$(DESTDIR)$(bindir)" mkdir -p "$(DESTDIR)$(sharedir)" @@ -50,19 +56,6 @@ install: mkdir -p "$(DESTDIR)$(sysconfdir)/default" mkdir -p "$(DESTDIR)$(sharedir)/${app_name}" mkdir -p "$(DESTDIR)$(sharedir)/icons" - mkdir -p "$(DESTDIR)$(localedir)/bg/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/cs/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/es/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/fr/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/nl/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/pt_BR/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/ru/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/sv/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/tr/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/da/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/eu/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/lt/LC_MESSAGES" - mkdir -p "$(DESTDIR)$(localedir)/uk/LC_MESSAGES" # binary install -m 0755 ${app_name} "$(DESTDIR)$(bindir)" @@ -88,6 +81,20 @@ install: chmod --recursive 0755 $(DESTDIR)$(sharedir)/icons/* # translations + mkdir -p "$(DESTDIR)$(localedir)/bg/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/cs/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/es/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/fr/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/nl/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/pt_BR/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/ru/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/sv/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/tr/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/da/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/eu/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/lt/LC_MESSAGES" + mkdir -p "$(DESTDIR)$(localedir)/uk/LC_MESSAGES" + msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/bg/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-bg.po msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/cs/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-cs.po msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/es/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-es.po diff --git a/test-cases b/test-cases deleted file mode 100644 index 229e414..0000000 --- a/test-cases +++ /dev/null @@ -1,25 +0,0 @@ -System-1: Ubuntu installed on single ext4 partition (/dev/hda1) -System-2: Ubuntu installed on luks-encrypted btfs partition (/dev/hda2) with /boot mounted on /dev/hda1 - -Test Cases: - -1. Restore a snapshot on sys-1. -2. Restore a snapshot on sys-2. -3. Restore snapshot on sys-1 while running sys-2. Verify restored system. -4. Restore snapshot on sys-2 while running sys-1. Verify restored system. - -For 1,2,3,4: Create a file named include.txt containing text old" or "new" in Home and add a include filter for the file. Change the wallper for each snapshot. Verify wallpaper and include.txt contents after restore. - -5. Clone sys-1 on empty disk /dev/hdc1. Boot cloned system and verify /etc/fstab. -6. Clone sys-1 on empty disk /dev/hdc2 with /boot on /dev/hdc1 and /home on /dev/hdc3. Boot cloned system and verify /etc/fstab. -7. Repeat steps 5,6 for sys-2. - -For 5,6,7: Verify /etc/fstab and /etc/crypttab. They should contain the device mappings that were selected before cloning the system. - -8. Run timeshift from Live system and verify that backup options are disabled. Restore options should be available. - -9. Run TC-1 from Fedora, OpenSUSE, Elementary OS and Manjaro. - -TODO: -------- -Option to install GRUB2 in UEFI mode for GPT target device.