mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
build-system: switch submodule protocol
As of today, GitHub no longer allows the 'git://' protocol, so we need to switch the submodule and our other references to cloning git repos to 'https://' instead. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
af88d34227
commit
c94e2b5d3f
11 changed files with 14 additions and 14 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,4 +1,4 @@
|
||||||
[submodule "libdivecomputer"]
|
[submodule "libdivecomputer"]
|
||||||
path = libdivecomputer
|
path = libdivecomputer
|
||||||
url = git://github.com/Subsurface/libdc.git
|
url = https://github.com/Subsurface/libdc.git
|
||||||
branch = Subsurface-NG
|
branch = Subsurface-NG
|
||||||
|
|
2
INSTALL
2
INSTALL
|
@ -88,7 +88,7 @@ QtWebKit is needed, if you want to print, but no longer part of Qt5,
|
||||||
so you need to download it and compile. In case you just want to test
|
so you need to download it and compile. In case you just want to test
|
||||||
without print possibility omit this step.
|
without print possibility omit this step.
|
||||||
|
|
||||||
git clone -b 5.212 git://github.com/qt/qtwebkit
|
git clone -b 5.212 https://github.com/qt/qtwebkit
|
||||||
mkdir -p qtwebkit/WebKitBuild/Release
|
mkdir -p qtwebkit/WebKitBuild/Release
|
||||||
cd qtwebkit/WebKitBuild/Release
|
cd qtwebkit/WebKitBuild/Release
|
||||||
cmake -DPORT=Qt -DCMAKE_BUILD_TYPE=Release -DQt5_DIR=/<Qt Location>/<version>/<type>/lib/cmake/Qt5 ../..
|
cmake -DPORT=Qt -DCMAKE_BUILD_TYPE=Release -DQt5_DIR=/<Qt Location>/<version>/<type>/lib/cmake/Qt5 ../..
|
||||||
|
|
|
@ -9,7 +9,7 @@ if [[ $(pwd | grep "subsurface$") || ! -d subsurface || ! -d subsurface/libdivec
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
if [[ ! -d googlemaps ]] ; then
|
if [[ ! -d googlemaps ]] ; then
|
||||||
echo "Please make sure you have the current master of git://github.com/Subsurface/googlemaps"
|
echo "Please make sure you have the current master of https://github.com/Subsurface/googlemaps"
|
||||||
echo "checked out in parallel to the Subsurface directory"
|
echo "checked out in parallel to the Subsurface directory"
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -5,7 +5,7 @@ The easiest way to build things is using our container:
|
||||||
|
|
||||||
mkdir $HOME/src
|
mkdir $HOME/src
|
||||||
cd $HOME/src
|
cd $HOME/src
|
||||||
git clone git://github.com/subsurface/subsurface
|
git clone https://github.com/subsurface/subsurface
|
||||||
cd subsurface
|
cd subsurface
|
||||||
git checkout version or branch you are testing
|
git checkout version or branch you are testing
|
||||||
cd ..
|
cd ..
|
||||||
|
@ -49,7 +49,7 @@ cd /android
|
||||||
wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip
|
wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip
|
||||||
unzip commandlinetools-linux-*.zip
|
unzip commandlinetools-linux-*.zip
|
||||||
|
|
||||||
git clone git://github.com/subsurface/subsurface
|
git clone https://github.com/subsurface/subsurface
|
||||||
|
|
||||||
# now get the SDK, NDK, Qt, everything that's needed
|
# now get the SDK, NDK, Qt, everything that's needed
|
||||||
bash /android/subsurface/packaging/android/android-build-setup.sh
|
bash /android/subsurface/packaging/android/android-build-setup.sh
|
||||||
|
|
|
@ -24,7 +24,7 @@ trac system.
|
||||||
* sudo dpkg-reconfigure tzdata
|
* sudo dpkg-reconfigure tzdata
|
||||||
* mkdir src
|
* mkdir src
|
||||||
* cd src
|
* cd src
|
||||||
* git clone git://subsurface-divelog.org/subsurface.git
|
* git clone https://subsurface-divelog.org/subsurface.git
|
||||||
* sudo apt-get install git g++ make autoconf automake libtool cmake pkg-config \
|
* sudo apt-get install git g++ make autoconf automake libtool cmake pkg-config \
|
||||||
libxml2-dev libxslt1-dev libzip-dev libsqlite3-dev \
|
libxml2-dev libxslt1-dev libzip-dev libsqlite3-dev \
|
||||||
libusb-1.0-0-dev libgit2-dev \
|
libusb-1.0-0-dev libgit2-dev \
|
||||||
|
|
|
@ -12,13 +12,13 @@ if [[ $(pwd | grep "subsurface$") || ! -d subsurface || ! -d subsurface/libdivec
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
if [[ ! -d googlemaps ]] ; then
|
if [[ ! -d googlemaps ]] ; then
|
||||||
echo "Please make sure you have the current master of git://github.com/Subsurface/googlemaps"
|
echo "Please make sure you have the current master of https://github.com/Subsurface/googlemaps"
|
||||||
echo "checked out in parallel to the Subsurface directory"
|
echo "checked out in parallel to the Subsurface directory"
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -d libgit2 ]] ; then
|
if [[ ! -d libgit2 ]] ; then
|
||||||
echo "Please make sure you have libgit2 1.0 from git://github.com/libgit2/libgit2"
|
echo "Please make sure you have libgit2 1.0 from https://github.com/libgit2/libgit2"
|
||||||
echo "checked out in parallel to the Subsurface directory"
|
echo "checked out in parallel to the Subsurface directory"
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -8,7 +8,7 @@ All it takes is this:
|
||||||
|
|
||||||
```
|
```
|
||||||
cd /some/path/windows
|
cd /some/path/windows
|
||||||
git clone git://github.com/subsurface/subsurface
|
git clone https://github.com/subsurface/subsurface
|
||||||
cd subsurface
|
cd subsurface
|
||||||
git submodule init
|
git submodule init
|
||||||
git submodule update
|
git submodule update
|
||||||
|
|
|
@ -264,7 +264,7 @@ if [ "$PLATFORM" = Linux ] && [[ $QT_VERSION == 5* ]] ; then
|
||||||
rm -rf "$INSTALL_ROOT"/include/QtLocation > /dev/null 2>&1
|
rm -rf "$INSTALL_ROOT"/include/QtLocation > /dev/null 2>&1
|
||||||
rm -rf "$INSTALL_ROOT"/include/QtPositioning > /dev/null 2>&1
|
rm -rf "$INSTALL_ROOT"/include/QtPositioning > /dev/null 2>&1
|
||||||
|
|
||||||
git clone --branch "v$QT_VERSION" git://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT
|
git clone --branch "v$QT_VERSION" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT
|
||||||
|
|
||||||
mkdir -p "$QTLOC_PRIVATE"
|
mkdir -p "$QTLOC_PRIVATE"
|
||||||
cd $QTLOC_GIT/src/location
|
cd $QTLOC_GIT/src/location
|
||||||
|
|
|
@ -51,7 +51,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||||
|
|
||||||
# checkout MXE at the right version
|
# checkout MXE at the right version
|
||||||
RUN mkdir -p /win
|
RUN mkdir -p /win
|
||||||
RUN cd /win ; git clone git://github.com/mxe/mxe ; \
|
RUN cd /win ; git clone https://github.com/mxe/mxe ; \
|
||||||
cd mxe ; \
|
cd mxe ; \
|
||||||
git checkout ${_ver} ;
|
git checkout ${_ver} ;
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ ENV QT_ROOT /usr/local/Qt/5.12.10/gcc_64
|
||||||
ENV PATH="/usr/local/Qt/5.12.10/gcc_64/bin/:${PATH}"
|
ENV PATH="/usr/local/Qt/5.12.10/gcc_64/bin/:${PATH}"
|
||||||
|
|
||||||
# now build and install QtWebKit
|
# now build and install QtWebKit
|
||||||
RUN git clone -b 5.212 git://github.com/qt/qtwebkit
|
RUN git clone -b 5.212 https://github.com/qt/qtwebkit
|
||||||
RUN mkdir -p qtwebkit/WebKitBuild/Release
|
RUN mkdir -p qtwebkit/WebKitBuild/Release
|
||||||
RUN cd qtwebkit/WebKitBuild/Release && cmake -DPORT=Qt -DCMAKE_BUILD_TYPE=Release -DQt5_DIR=/usr/local/Qt/5.12.10/gcc_64/lib/cmake/Qt5 ../..
|
RUN cd qtwebkit/WebKitBuild/Release && cmake -DPORT=Qt -DCMAKE_BUILD_TYPE=Release -DQt5_DIR=/usr/local/Qt/5.12.10/gcc_64/lib/cmake/Qt5 ../..
|
||||||
RUN cd qtwebkit/WebKitBuild/Release && make -j4 && make install
|
RUN cd qtwebkit/WebKitBuild/Release && make -j4 && make install
|
||||||
|
@ -78,7 +78,7 @@ RUN apt-get remove -y libqt5core5a libqt5dbus5 libqt5gui5 ruby openssh-client
|
||||||
|
|
||||||
# now build Subsurface once to populate the dependencies we don't get from
|
# now build Subsurface once to populate the dependencies we don't get from
|
||||||
# Ubuntu but that aren't really part of Subsurface (libgit, googlemaps)
|
# Ubuntu but that aren't really part of Subsurface (libgit, googlemaps)
|
||||||
RUN git clone git://github.com/Subsurface/subsurface
|
RUN git clone https://github.com/Subsurface/subsurface
|
||||||
RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
|
RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
|
||||||
|
|
||||||
# remove the source, but keep the install-root
|
# remove the source, but keep the install-root
|
||||||
|
|
|
@ -30,7 +30,7 @@ apps:
|
||||||
|
|
||||||
parts:
|
parts:
|
||||||
googlemaps:
|
googlemaps:
|
||||||
source: git://github.com/Subsurface/googlemaps.git
|
source: https://github.com/Subsurface/googlemaps.git
|
||||||
build-packages:
|
build-packages:
|
||||||
- wget
|
- wget
|
||||||
override-pull: |
|
override-pull: |
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue