fix path for gh-pages checkout
This commit is contained in:
parent
4c48fda5ad
commit
e76000d87b
3
pom.xml
3
pom.xml
|
@ -29,8 +29,7 @@
|
|||
<tycho-version>1.5.0</tycho-version>
|
||||
<groovy-eclipse-compiler-version>3.6.0-03</groovy-eclipse-compiler-version>
|
||||
<groovy-eclipse-batch-version>3.0.3-01</groovy-eclipse-batch-version>
|
||||
<!-- <software.download.area>${user.home}/deployment-work/${DEPLOY_WORK_DIRECTORY}</software.download.area> -->
|
||||
<software.download.area>${project.build.directory}/../</software.download.area>
|
||||
<software.download.area>${project.basedir}/../../..</software.download.area>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
<workingDirectory>${software.download.area}</workingDirectory>
|
||||
<arguments>
|
||||
<argument>-c</argument>
|
||||
<argument>if [ -d gh-pages ]; then cd gh-pages; git pull; else git clone --branch gh-pages https://git.minres.com/VP-Tools/SCViewer.git gh-pages; fi</argument>
|
||||
<argument>if [ -d SCViewer-GHP ]; then cd SCViewer-GHP; git pull; else git clone -v --branch gh-pages https://git.minres.com/VP-Tools/SCViewer.git SCViewer-GHP; fi</argument>
|
||||
</arguments>
|
||||
<environmentVariables>
|
||||
<LANG>en_US</LANG>
|
||||
|
@ -64,7 +64,7 @@
|
|||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<!-- IMPORTANT: DO NOT split the arg line -->
|
||||
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2-composite.ant p2.composite.add -Dsite.label="SCViewer Software Repository" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -Dsoftware.download.area="${software.download.area}/gh-pages/repository"</appArgLine>
|
||||
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2-composite.ant p2.composite.add -Dsite.label="SCViewer Software Repository" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -Dsoftware.download.area="${software.download.area}/SCViewer-GHP/repository"</appArgLine>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>2020-03</id>
|
||||
|
|
Loading…
Reference in New Issue