diff --git a/.gitignore b/.gitignore index 7c32f559819ea656fdf8fb45ff9c4c5a3e3c1355..52294d93b509fd2eb1f3ee826a2b195a634d2a12 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -install +/install diff --git a/README.md b/README.md index 0b1f63a40a935921daa0e8f827a3060de301cdd1..76ce406bfc732ac87ddaa05106d6a521f05b171c 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,15 @@ # Ring -Synchronization of all the repositories of <https://ring.cx/> through submodules, with scripts to build for each platform easily. +Synchronization via submodules of the repositories of <https://ring.cx/> to states in which they work together + scripts to build for each platform easily. Fixes <https://tuleap.ring.cx/plugins/tracker/?aid=250>. -I'd rather have a single Git repo, but without official support, maintaining a single git repo is useless, so I'll start with submodules which are easier to put together. +I'd rather have a single Git repo, but without official support, maintaining a merged single git repo is useless, so I'll start with submodules which are easier to paste together. ## Ubuntu 15.10 +Build, install locally under this repository, and run that local install: + ./ubuntu-15.10.sh nohup ./install/daemon/libexec/dring >/dev/null & LD_LIBRARY_PATH="$LD_LIBRARY_PATH:install/lrc/lib" ./install/client-gnome/bin/gnome-ring diff --git a/clean-DATA-LOSS.sh b/clean-DATA-LOSS.sh index 6544525f72dbb7053ac23f2cf743f168b6604308..906781299a357e0485ee1e7c2424d073973a4d23 100755 --- a/clean-DATA-LOSS.sh +++ b/clean-DATA-LOSS.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash -# Remove everything that is not git tracked. +# Remove everything that is not git tracked on the submodules. # May cause data loss. git submodule foreach git clean -dfx +rm -rf install/* diff --git a/ubuntu-15.10.sh b/ubuntu-15.10.sh index 9d265d3e4771c46dea11d7fcba3c312fa221bba1..a0ddd2c1db70e0aeb31be58fca8c3e63dcc058c8 100755 --- a/ubuntu-15.10.sh +++ b/ubuntu-15.10.sh @@ -78,6 +78,7 @@ cd "${TOP}/client-gnome" mkdir -p build cd build cmake .. \ + -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX="${INSTALL}/client-gnome" \ -DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient" make