Skip to content

Commit

Permalink
Adding the config .ini parsion instead of dead copy
Browse files Browse the repository at this point in the history
  • Loading branch information
@madhephaestus
madhephaestus committed Jul 14, 2020
1 parent 6f6763a commit 83168e7
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 52 deletions.
14 changes: 7 additions & 7 deletions TEMPLATErbeArduinoEclipseInstaller.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ Source: {#MyAppPath}\graphviz\*; DestDir: C:\RBE\graphviz\; Flags: recursesubdi
Source: {#MyAppPath}\doxygen\*; DestDir: C:\RBE\doxygen\; Flags: recursesubdirs createallsubdirs;

Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.core.runtime\.settings\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.core.runtime\.settings; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.rse.core\profiles\PRF.desktop-tlp1o5p_32629\\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.rse.core\profiles\PRF.desktop-tlp1o5p_32629\; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.rse.core\initializerMarks\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.rse.core\initializerMarks; Flags: recursesubdirs createallsubdirs;
//Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.rse.core\profiles\PRF.desktop-tlp1o5p_32629\\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.rse.core\profiles\PRF.desktop-tlp1o5p_32629\; Flags: recursesubdirs createallsubdirs;
//Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.rse.core\initializerMarks\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.rse.core\initializerMarks; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.ui.workbench\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.ui.workbench; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.e4.workbench\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.e4.workbench; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.cdt.make.core\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.cdt.make.core; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.core.resources\.projects\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.core.resources\.projects; Flags: recursesubdirs createallsubdirs;
//Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.core.resources\.projects\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.core.resources\.projects; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.core.resources\.root\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.core.resources\.root; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.core.resources\.root\.indexes\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.core.resources\.root\.indexes; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.core.resources\.safetable\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.core.resources\.safetable; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.mylyn.context.core\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.mylyn.context.core; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.ui.ide\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.ui.ide; Flags: recursesubdirs createallsubdirs;
//Source: {#MyAppPath}\eclipse-workspace\.metadata\.plugins\org.eclipse.ui.ide\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.plugins\org.eclipse.ui.ide; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\.mylyn\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\.mylyn; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\eclipse-workspace\.metadata\\*; DestDir: C:\RBE\eclipse-workspace\\.metadata\; Flags: recursesubdirs createallsubdirs;
Source: {#MyAppPath}\driver\*; DestDir: C:\RBE\driver; Excludes: .*
Expand Down Expand Up @@ -95,7 +95,7 @@ Filename: {sys}\rundll32.exe; Parameters: "setupapi,InstallHinfSection DefaultIn

[icons]
name: {commondesktop}\arduino-rbe-esp32; filename: c:\rbe\arduino-1.8.5\arduino.exe; workingdir: c:\rbe\arduino-1.8.5\; comment: "wpi rbe esp32 arduino";iconfilename: c:\rbe\arduino-1.8.5\lib\arduino_icon.ico;
name: {commondesktop}\sloeber-rbe-esp32; filename: c:\rbe\sloeber\sloeber-ide.exe; workingdir: c:\rbe\sloeber\; comment: "wpi rbe esp32 sloeber";iconfilename: c:\rbe\sloeber\sloeber.ico;
name: {commondesktop}\sloeber-rbe-esp32; filename: c:\rbe\sloeber\eclipse.exe; workingdir: c:\rbe\sloeber\; comment: "wpi rbe esp32 sloeber";iconfilename: c:\rbe\sloeber\sloeber.ico;
[code]
// utility functions for inno setup
Expand Down Expand Up @@ -174,15 +174,15 @@ begin
if curstep=sspostinstall then
setfirewallexception('arduino', 'c:\rbe\arduino-1.8.5\java\bin\javaw.exe');
if curstep=sspostinstall then
setfirewallexception('sloeber-ide', 'c:\rbe\sloeber\sloeber-ide.exe');
setfirewallexception('sloeber-ide', 'c:\rbe\sloeber\eclipse.exe');
end;
procedure curuninstallstepchanged(curuninstallstep: tuninstallstep);
begin
if curuninstallstep=uspostuninstall then
removefirewallexception( 'c:\rbe\arduino-1.8.5\java\bin\javaw.exe');
if curuninstallstep=uspostuninstall then
removefirewallexception( 'c:\rbe\sloeber\sloeber-ide.exe');
removefirewallexception( 'c:\rbe\sloeber\eclipse.exe');
end;
function NeedsAddPath(Param: string): boolean;
Expand Down
22 changes: 10 additions & 12 deletions config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser
#Wed Oct 10 19:08:08 GMT 2018
eclipse.p2.profile=DefaultProfile
osgi.instance.area.default=C\:\\RBE\\eclipse-workspace
osgi.framework=file\:plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar
equinox.use.ds=true
ds.delayed.keepInstances=true
osgi.bundles=reference\:file\:org.eclipse.equinox.simpleconfigurator_1.3.0.v20180502-1828.jar@1\:start
#Thu Mar 14 14:31:27 EDT 2019
eclipse.product=org.eclipse.platform.ide
osgi.splashPath=platform\:/base/plugins/org.eclipse.platform
org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
eclipse.product=io.sloeber.application.product
org.eclipse.oomph.setup.ui/enable.preference.recorder=false
osgi.splashPath=platform\:/base/plugins/io.sloeber.application
osgi.framework.extensions=reference\:file\:org.eclipse.equinox.region_1.4.100.v20171221-2204.jar,reference\:file\:org.eclipse.equinox.transforms.hook_1.2.100.v20171221-2204.jar,reference\:file\:org.eclipse.equinox.weaving.hook_1.2.100.v20171221-2204.jar,reference\:file\:org.eclipse.osgi.compatibility.state_1.1.100.v20180331-1743.jar
osgi.bundles.defaultStartLevel=4
eclipse.p2.data.area[email protected]/../p2
eclipse.application=org.eclipse.ui.ide.workbench
osgi.bundles=reference\:file\:org.eclipse.equinox.simpleconfigurator_1.3.200.v20181101-1115.jar@1\:start
eclipse.p2.data.area[email protected]/../p2
eclipse.p2.profile=epp.package.java
osgi.framework=file\:plugins/org.eclipse.osgi_3.13.300.v20190218-1622.jar
osgi.framework.extensions=reference\:file\:org.eclipse.osgi.compatibility.state_1.1.400.v20190208-1533.jar
eclipse.buildId=4.11.0.I20190307-0500
osgi.instance.area.default=F\:\\RBE\\eclipse-workspace
45 changes: 24 additions & 21 deletions prep.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,36 +54,22 @@ if (! test -z "$VERSION" ) then

cp LICENSE.txt $DIR
cp sloeber.ico $DIR/sloeber/
if (! test -e $INSTLAB) then
rm -rf $INSTDIR/runWPI.iss
cp rbe/TEMPLATErbeArduinoEclipseInstaller.iss $INSTDIR/runWPI.iss
cp rbe/org.eclipse.ui.ide.prefs $DIR/sloeber/configuration/.settings/
cp rbe/config.ini $DIR/sloeber/configuration/
cp rbe/preferences.txt $DIR/arduino-1.8.5/lib/
sed -i s/VER/"$VERSION"/g $INSTDIR/runWPI.iss

echo Running wine C:\$INSTDIR\run.iss

if ( wine "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" /cc "c:\rbe-inst-iss\runWPI.iss") then
echo wine ok
else
exit 1
fi
fi
#exit 0

if (! test -e $INST) then
rm -rf $INSTDIR/run.iss
cp TEMPLATErbeArduinoEclipseInstaller.iss $INSTDIR/run.iss
sed -i s/VER/"$VERSION"/g $INSTDIR/run.iss
cp org.eclipse.ui.ide.prefs $DIR/sloeber/configuration/.settings/
grep -v "osgi.instance.area.default" rbe-inst/sloeber/configuration/config.ini > config.ini
echo "osgi.instance.area.default=C\:\\\\RBE\\\\eclipse-workspace" >>config.ini
cp config.ini $DIR/sloeber/configuration/
cp io.sloeber.core.ui.prefs $DIR/eclipse-workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/
cp io.sloeber.arduino.prefs $DIR/eclipse-workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/
cp org.eclipse.egit.core.prefs $DIR/eclipse-workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/
cp preferences.txt $DIR/arduino-1.8.5/lib/
chmod -R 7777 $DIR/eclipse-workspace/


exit 0
echo Running wine C:\$INSTDIR\run.iss

if ( wine "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" /cc "c:\rbe-inst-iss\run.iss") then
Expand All @@ -95,9 +81,26 @@ if (! test -z "$VERSION" ) then
exit 1
fi
fi

if (! test -e $INSTLAB) then
rm -rf $INSTDIR/runWPI.iss
cp rbe/TEMPLATErbeArduinoEclipseInstaller.iss $INSTDIR/runWPI.iss
cp rbe/org.eclipse.ui.ide.prefs $DIR/sloeber/configuration/.settings/
grep -v "osgi.instance.area.default" rbe-inst/sloeber/configuration/config.ini > rbe/config.ini
echo "osgi.instance.area.default=R\:\\\\RBE\\\\eclipse-workspace" >>rbe/config.ini
cp rbe/config.ini $DIR/sloeber/configuration/
cp rbe/preferences.txt $DIR/arduino-1.8.5/lib/
sed -i s/VER/"$VERSION"/g $INSTDIR/runWPI.iss

echo Running wine C:\$INSTDIR\run.iss

if ( wine "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" /cc "c:\rbe-inst-iss\runWPI.iss") then
echo wine ok
else
exit 1
fi
fi
testget GithubPublish.jar
java -jar GithubPublish.jar ESP32ArduinoEclipseInstaller WPIRoboticsEngineering $VERSION $INST
java -jar GithubPublish.jar ESP32ArduinoEclipseInstaller WPIRoboticsEngineering $VERSION $INSTLAB
java -Xmx8g -jar GithubPublish.jar ESP32ArduinoEclipseInstaller WPIRoboticsEngineering $VERSION $INST
java -Xmx8g -jar GithubPublish.jar ESP32ArduinoEclipseInstaller WPIRoboticsEngineering $VERSION $INSTLAB

fi
22 changes: 10 additions & 12 deletions rbe/config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser
#Wed Oct 10 19:08:08 GMT 2018
eclipse.p2.profile=DefaultProfile
osgi.instance.area.default=R\:\\RBE\\eclipse-workspace
osgi.framework=file\:plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar
equinox.use.ds=true
ds.delayed.keepInstances=true
osgi.bundles=reference\:file\:org.eclipse.equinox.simpleconfigurator_1.3.0.v20180502-1828.jar@1\:start
#Thu Mar 14 14:31:27 EDT 2019
eclipse.product=org.eclipse.platform.ide
osgi.splashPath=platform\:/base/plugins/org.eclipse.platform
org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
eclipse.product=io.sloeber.application.product
org.eclipse.oomph.setup.ui/enable.preference.recorder=false
osgi.splashPath=platform\:/base/plugins/io.sloeber.application
osgi.framework.extensions=reference\:file\:org.eclipse.equinox.region_1.4.100.v20171221-2204.jar,reference\:file\:org.eclipse.equinox.transforms.hook_1.2.100.v20171221-2204.jar,reference\:file\:org.eclipse.equinox.weaving.hook_1.2.100.v20171221-2204.jar,reference\:file\:org.eclipse.osgi.compatibility.state_1.1.100.v20180331-1743.jar
osgi.bundles.defaultStartLevel=4
eclipse.p2.data.area[email protected]/../p2
eclipse.application=org.eclipse.ui.ide.workbench
osgi.bundles=reference\:file\:org.eclipse.equinox.simpleconfigurator_1.3.200.v20181101-1115.jar@1\:start
eclipse.p2.data.area[email protected]/../p2
eclipse.p2.profile=epp.package.java
osgi.framework=file\:plugins/org.eclipse.osgi_3.13.300.v20190218-1622.jar
osgi.framework.extensions=reference\:file\:org.eclipse.osgi.compatibility.state_1.1.400.v20190208-1533.jar
eclipse.buildId=4.11.0.I20190307-0500
osgi.instance.area.default=R\:\\RBE\\eclipse-workspace

0 comments on commit 83168e7

Please sign in to comment.