Commit 500a6a00 authored by Thibault Saunier's avatar Thibault Saunier

build: Fix xdg-app leftovers

parent 23416bc8
......@@ -69,7 +69,9 @@ pitivi/libpitivi/.libs/*
*.typelib
prebuilt/
# xdg-app
# xdg-app/flatpak
build/flatpak/.flatpak-app-builder/
build/flatpak/pitivi-*.json
build/xdg-app/.xdg-app-builder/
build/xdg-app/pitivi-*.json
build/devel/
......@@ -8,15 +8,15 @@ SCRIPT=${BASH_SOURCE[0]:-$0}
&& exit 1
SCRIPTDIR=$(dirname $(realpath $SCRIPT))
export XDGAPP_ENVPATH=$(realpath $SCRIPTDIR/../../)
export CURRENT_GST=$XDGAPP_ENVPATH
export MYPITIVI=$XDGAPP_ENVPATH
export FLATPAK_ENVPATH=$(realpath $SCRIPTDIR/../../)
export CURRENT_GST=$FLATPAK_ENVPATH
export MYPITIVI=$FLATPAK_ENVPATH
export make="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make"
export check="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make check"
export minstall="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make install"
export autogen="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b ./autogen.sh --prefix=/app --disable-gtk-doc"
export configure="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b ./configure --prefix=/app --disable-gtk-doc"
export make="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make"
export check="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make check"
export minstall="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b make install"
export autogen="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b ./autogen.sh --prefix=/app --disable-gtk-doc"
export configure="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b ./configure --prefix=/app --disable-gtk-doc"
alias make=$make
alias check=$check
......@@ -24,7 +24,7 @@ alias minstall=$minstall
alias autogen=$autogen
alias configure=$configure
alias ptvenv="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b"
alias ptvenv="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b"
echo "-> Setting up environment if needed..."
ptvenv "echo"
......@@ -32,13 +32,13 @@ if [ "$?" = "0" ];
then
for i in `ptvenv ls /app/bin/`;
do
alias $i="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b $i"
alias $i="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b $i"
done
alias pitivi="$XDGAPP_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b bin/pitivi"
alias pitivi="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -b bin/pitivi"
export PS1="(ptv-xdgapp) $PS1"
export PATH="$XDGAPP_ENVPATH/bin/:$PATH"
export PS1="(ptv-flatpak) $PS1"
export PATH="$FLATPAK_ENVPATH/bin/:$PATH"
echo "===================================================================="
echo " BATTLECRUISER OPERATIONAL "
......
......@@ -5,12 +5,12 @@
### Setup pitivi
The official way of getting your environment up and running is by using
[xdg-app](https://en.wikipedia.org/wiki/Xdg-app)
[flatpak](http://flatpak.org/)
You first need to [get xdg-app](https://wiki.gnome.org/Projects/SandboxedApps/Packages)
making sure you also install xdg-app-builder, which might be provided by an
You first need to [get flatpak](http://flatpak.org/getting.html)
making sure you also install flatpak-builder, which might be provided by an
additional package on some distributions (please tell us if it is the case
for yours so we can make a list here).
for yours so we can make a list here).
Then, create a development environment folder and get the [https://git.gnome.org/browse/pitivi/tree/ Pitivi source code] into it:
......@@ -34,8 +34,8 @@ ptvenv --update
```
That will actually clean the prefix, update all dependencies from their
git repos and tarballs as defined in the xdg-app manifest (located
in build/xdg-app/pitivi.template.json)
git repos and tarballs as defined in the flatpak manifest (located
in build/flatpak/pitivi.template.json)
### Work on some pitivi dependencies in the development environment
......@@ -46,7 +46,7 @@ you can clone it into you `pitivi-dev`:
git clone git://anongit.freedesktop.org/gstreamer/gst-editing-services
```
Then you can just hack on it, run `autogen` to run `./autogen.sh` with the right arguments for the xdg-app sandbox,
Then you can just hack on it, run `autogen` to run `./autogen.sh` with the right arguments for the flatpak sandbox,
and run `make install` to install your changes inside the sandbox (your changes won’t be taken into accout
without installing).
......
Markdown is supported
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