Skip to content

Commit 1b9aa0c

Browse files
jocelynjocelyn
committed
Updated the ewf estudio wizard to have a console and a graphical wizard.
Usage: wizard -callback file.cb path-to-rootdir folder.
1 parent 6e52774 commit 1b9aa0c

File tree

69 files changed

+4305
-699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+4305
-699
lines changed

‎tools/ise_wizard/ewf_ise_wizard-safe.ecf‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,50 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="wizard" uuid="F881A707-745E-4C6D-90D1-F820EE3B1470" library_target="wizard">
2+
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="wizard" uuid="F881A707-745E-4C6D-90D1-F820EE3B1470" library_target="wizard">
33
<target name="wizard">
4-
<root class="EWF_WIZARD" feature="make"/>
4+
<root class="EWF_CONSOLE_WIZARD_APPLICATION" feature="make"/>
55
<file_rule>
66
<exclude>/.git$</exclude>
77
<exclude>/EIFGENs$</exclude>
88
<exclude>/.svn$</exclude>
99
</file_rule>
1010
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
1111
</option>
12+
<setting name="console_application" value="true"/>
1213
<setting name="concurrency" value="none"/>
1314
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
14-
<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid-safe.ecf"/>
15-
<cluster name="src" location=".\src\" recursive="true"/>
15+
<library name="console_wizard" location="lib\wizard\estudio_console_wizard-safe.ecf" readonly="false"/>
16+
<library name="template_smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf"/>
17+
<cluster name="src" location=".\src\" recursive="true">
18+
<file_rule>
19+
<exclude>/gui$</exclude>
20+
<exclude>/lib$</exclude>
21+
</file_rule>
22+
</cluster>
1623
</target>
17-
<target name="custom_wizard" extends="wizard">
18-
<root class="EWF_CUSTOM_WIZARD" feature="make"/>
24+
<target name="gui_wizard">
25+
<root class="EWF_GRAPHICAL_WIZARD" feature="make_and_launch"/>
26+
<file_rule>
27+
<exclude>/.git$</exclude>
28+
<exclude>/EIFGENs$</exclude>
29+
<exclude>/.svn$</exclude>
30+
</file_rule>
31+
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
32+
</option>
33+
<setting name="concurrency" value="none"/>
34+
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
35+
<library name="gui_wizard" location="lib\wizard\estudio_gui_wizard-safe.ecf" readonly="false"/>
36+
<library name="template_smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf" readonly="false"/>
37+
<library name="vision2" location="$ISE_LIBRARY\library\vision2\vision2-safe.ecf">
38+
<option>
39+
<assertions precondition="true"/>
40+
</option>
41+
</library>
42+
<cluster name="graphical" location=".\src\gui\" recursive="true"/>
43+
<cluster name="src" location=".\src\" recursive="true">
44+
<file_rule>
45+
<exclude>/gui$</exclude>
46+
<exclude>/lib$</exclude>
47+
</file_rule>
48+
</cluster>
1949
</target>
2050
</system>

‎tools/ise_wizard/install_ise_wizard.bat‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
setlocal
22

3-
rd /q/s tmp
4-
mkdir tmp
5-
ecb -config ewf_ise_wizard-safe.ecf -target wizard -finalize -c_compile -project_path tmp
6-
mkdir spec
7-
mkdir spec\%ISE_PLATFORM%
8-
move tmp\EIFGENs\wizard\F_code\wizard.exe spec\%ISE_PLATFORM%\wizard.exe
9-
rd /q/s tmp
3+
set TMP_ROOTDIR=%~dp0rootdir
4+
set TMP_TARGETNAME=wizard
105

116
set WIZ_TARGET=%ISE_EIFFEL%\studio\wizards\new_projects\ewf
127
rd /q/s %WIZ_TARGET%
138
mkdir %WIZ_TARGET%
14-
xcopy /I /E /Y %~dp0\pixmaps %WIZ_TARGET%\pixmaps
15-
xcopy /I /E /Y %~dp0\resources %WIZ_TARGET%\resources
16-
xcopy /I /E /Y %~dp0\spec %WIZ_TARGET%\spec
17-
copy ewf.dsc %WIZ_TARGET%\..\ewf.dsc
9+
xcopy /I /E /Y %TMP_ROOTDIR% %WIZ_TARGET%
10+
if not exist %WIZ_TARGET%\pixmaps mkdir %WIZ_TARGET%\pixmaps
11+
move %WIZ_TARGET%\ewf.dsc %WIZ_TARGET%\..\ewf.dsc
12+
13+
rd /q/s tmp
14+
mkdir tmp
15+
ecb -config ewf_ise_wizard-safe.ecf -target %TMP_TARGETNAME% -finalize -c_compile -project_path tmp
16+
rd /q/s %WIZ_TARGET%\spec
17+
mkdir %WIZ_TARGET%\spec
18+
mkdir %WIZ_TARGET%\spec\%ISE_PLATFORM%
19+
move tmp\EIFGENs\%TMP_TARGETNAME%\F_code\wizard.exe %WIZ_TARGET%\spec\%ISE_PLATFORM%\wizard.exe
20+
rd /q/s tmp
1821

1922
endlocal

‎tools/ise_wizard/install_ise_wizard_custom.bat‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
setlocal
22

3-
rd /q/s tmp
4-
mkdir tmp
5-
ecb -config ewf_ise_wizard-safe.ecf -target custom_wizard -finalize -c_compile -project_path tmp
6-
mkdir custom
7-
mkdir custom\spec
8-
mkdir custom\spec\%ISE_PLATFORM%
9-
move tmp\EIFGENs\custom_wizard\F_code\wizard.exe custom\spec\%ISE_PLATFORM%\wizard.exe
10-
rd /q/s tmp
3+
set TMP_ROOTDIR=%~dp0rootdir
4+
set TMP_TARGETNAME=custom_wizard
115

12-
set WIZ_TARGET=%ISE_EIFFEL%\studio\wizards\new_projects\ewf_custom
6+
set WIZ_TARGET=%ISE_EIFFEL%\studio\wizards\new_projects\ewf
137
rd /q/s %WIZ_TARGET%
148
mkdir %WIZ_TARGET%
15-
xcopy /I /E /Y %~dp0\pixmaps %WIZ_TARGET%\pixmaps
16-
xcopy /I /E /Y %~dp0\resources %WIZ_TARGET%\resources
17-
copy %~dp0\custom\resources\* %WIZ_TARGET%\resources
18-
xcopy /I /E /Y %~dp0\custom\spec %WIZ_TARGET%\spec
19-
copy %~dp0custom\ewf.dsc %WIZ_TARGET%\..\ewf_custom.dsc
9+
xcopy /I /E /Y %TMP_ROOTDIR% %WIZ_TARGET%
10+
copy %~dp0rootdir_custom\ewf.dsc %WIZ_TARGET%\ewf.dsc
11+
copy %~dp0rootdir_custom\resources\* %WIZ_TARGET%\resources
12+
if not exist %WIZ_TARGET%\pixmaps mkdir %WIZ_TARGET%\pixmaps
13+
move %WIZ_TARGET%\ewf.dsc %WIZ_TARGET%\..\ewf.dsc
14+
15+
rd /q/s tmp
16+
mkdir tmp
17+
ecb -config ewf_ise_wizard-safe.ecf -target %TMP_TARGETNAME% -finalize -c_compile -project_path tmp
18+
rd /q/s %WIZ_TARGET%\spec
19+
mkdir %WIZ_TARGET%\spec
20+
mkdir %WIZ_TARGET%\spec\%ISE_PLATFORM%
21+
move tmp\EIFGENs\%TMP_TARGETNAME%\F_code\wizard.exe %WIZ_TARGET%\spec\%ISE_PLATFORM%\wizard.exe
22+
rd /q/s tmp
2023

2124
endlocal

0 commit comments

Comments
 (0)