ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: windows deploy fixes

Browse Source 
* fixed build script for windows installer
* fixed java dependency version in windows installer
* accept eula in windows deploy script before indexing sample projects
* removed set license from windows deploy script before indexing sample projects
This commit is contained in:
mlangkabel
2018-04-11 12:36:10 +02:00
parent 608e56940a
commit 415b9dd5ff
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/wixSetup/build.sh
+1 -1
View File
@@ -30,7 +30,7 @@ echo $"%windir%\system32\msiexec.exe /x {$PRODUCT_GUID}" >../../../bin/app/data/
OUTPUT_DIR=bin/$WIN_ARCH
rm -rf $OUTPUT_DIR
mkdir $OUTPUT_DIR
mkdir -p $OUTPUT_DIR
candle.exe -dProductVersion="$VERSION_STRING" -dProductGuid="$PRODUCT_GUID" -arch $X_ARCH sourcetrail.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
light.exe -ext WixUIExtension build/sourcetrail.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/sourcetrail.msi > build/linkLog.txt
deployment/windows/wixSetup/installDir.wxs
+2 -2
View File
@@ -874,7 +874,7 @@
<File Id='OrgEclipseCoreFilesystem' Name='org.eclipse.core.filesystem-1.7.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.filesystem-1.7.0.jar' KeyPath='yes' />
</Component>
<Component Id='JavaOrgEclipseCoreJobsJar' Guid='*' Win64="$(var.Win64)">
<File Id='OrgEclipseCoreJobs' Name='org.eclipse.core.jobs-3.9.3.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.jobs-3.9.2.jar' KeyPath='yes' />
<File Id='OrgEclipseCoreJobs' Name='org.eclipse.core.jobs-3.9.3.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.jobs-3.9.3.jar' KeyPath='yes' />
</Component>
<Component Id='JavaOrgEclipseCoreResourcesJar' Guid='*' Win64="$(var.Win64)">
<File Id='OrgEclipseCoreResources' Name='org.eclipse.core.resources-3.12.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.resources-3.12.0.jar' KeyPath='yes' />
@@ -898,7 +898,7 @@
<File Id='OrgEclipseJdtCore' Name='org.eclipse.jdt.core-3.13.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.jdt.core-3.13.0.jar' KeyPath='yes' />
</Component>
<Component Id='JavaOrgEclipseOsgiJar' Guid='*' Win64="$(var.Win64)">
<File Id='OrgEclipseOsgi' Name='org.eclipse.osgi-3.12.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.osgi-3.12.50.jar' KeyPath='yes' />
<File Id='OrgEclipseOsgi' Name='org.eclipse.osgi-3.12.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.osgi-3.12.100.jar' KeyPath='yes' />
</Component>
<Component Id='JavaOrgEclipseTextJar' Guid='*' Win64="$(var.Win64)">
<File Id='OrgEclipseText' Name='org.eclipse.text-3.6.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.text-3.6.100.jar' KeyPath='yes' />
script/deploy_windows.sh
+1 -1
View File
@@ -83,7 +83,7 @@ if [ $UPDATE_DATABASES = true ]; then
cd temp
echo -e "$INFO configuring application"
../build/win32/Release/app/Sourcetrail.exe config -z ../setup/license.txt
../build/win32/Release/app/Sourcetrail.exe accept-eula
../build/win32/Release/app/Sourcetrail.exe config -t 8
../build/win32/Release/app/Sourcetrail.exe config -M 1024