mirror of
https://github.com/Misterblue/convoar.git
synced 2026-08-14 09:02:14 +00:00
Add parameter for updateVersion.sh to specify the location of the bin file.
This commit is contained in:
+7
-1
@@ -20,6 +20,12 @@ ARG CONVOAR_BRANCH=v2
|
||||
ARG COMMON_ENTITIES_BRANCH=dev
|
||||
ARG COMMON_UTIL_BRANCH=main
|
||||
|
||||
ADD https://api.github.com/repos/misterblue/BuildVersion/git/refs/heads/main buildversion-git-version.json
|
||||
RUN cd $PLACE \
|
||||
&& git clone --depth 1 -b main --single-branch https://github.com/misterblue/BuildVersion.git \
|
||||
&& cd BuildVersion \
|
||||
&& msbuild /p:Configuration=Release
|
||||
|
||||
ADD https://api.github.com/repos/opensim/opensim/git/refs/heads/$OPENSIM_BRANCH opensim-git-version.json
|
||||
RUN cd $PLACE \
|
||||
&& git clone --depth 1 -b $OPENSIM_BRANCH --single-branch https://github.com/opensim/opensim.git \
|
||||
@@ -37,7 +43,7 @@ RUN cd $PLACE \
|
||||
&& cd convoar \
|
||||
&& mkdir bin \
|
||||
&& OPENSIMBIN=$PLACE/opensim/bin LIBOMVBIN=$PLACE/opensim/bin ./gatherLibs.sh \
|
||||
&& ./updateVersion.sh \
|
||||
&& ./updateVersion.sh ../BuildVersion/bin/Release/BuildVersion.exe \
|
||||
&& mkdir addon-modules \
|
||||
&& cd addon-modules \
|
||||
&& git clone --depth 1 -b $COMMON_ENTITIES_BRANCH --single-branch https://github.com/Herbal3d/HerbalCommonEntitiesCS.git \
|
||||
|
||||
+3
-1
@@ -1,6 +1,8 @@
|
||||
#! /bin/bash
|
||||
|
||||
./BuildVersion/BuildVersion.exe --namespace org.herbal3d.convoar \
|
||||
BUILDVERSION=${1:-./BuildVersion/BuildVersion.exe}
|
||||
|
||||
$BUILDVERSION --namespace org.herbal3d.convoar \
|
||||
--verbose \
|
||||
--version $(cat VERSION) \
|
||||
--versionFile convoar/VersionInfo.cs \
|
||||
|
||||
Reference in New Issue
Block a user