Skip to content

Commit 20393d4

Browse files
committed
Removed macro definition option
1 parent c79e840 commit 20393d4

16 files changed

+13
-21
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OpenIDE-Module-Display-Category=Tools
22
OpenIDE-Module-Long-Description=\
3-
The SDCC compiler automatically calls GPUtils tools gpasm and gplink. \
4-
In order to be full functional both tools need to be installed.\n\
3+
The SDCC compiler automatically calls the GPUtils tools gpasm and gplink. \
4+
For it to be fully functional both tools need to be installed.\n\
55
Remember to allow them to set up the path.
66
OpenIDE-Module-Name=SDCC Toolchain
77
OpenIDE-Module-Short-Description=SDCC compiler

build/classes/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<mp:textEmitter mp:text="${RM} ${CURRENT_OBJECT_FILE} ${NEWLINE}"/>
4949
<!-- this is the beginning of the compiler line -->
5050
<mp:textEmitter mp:text="${MP_CC} "/>
51-
<mp:textEmitter mp:text="--debug-ralloc "/>
5251
<mp:optionEmitter mp:idref="sdcc" mp:separator=" "/>
5352
<mp:textEmitter mp:text=" -c"/>
5453
<mp:textEmitter mp:text=" -m${PROCESSOR_FAMILY}"/>
@@ -432,7 +431,7 @@ sed 's#.*# <mp:device mp:name="\0" mp:support="beta"/>#'
432431
<!-- list below generated by
433432
sdcc -v
434433
{ sdcc -mpic16 -phelp dummy.c 2>&1; } | \
435-
sed -n '1,/^Valid devices are (use --verbose for more details)/d; p' | \
434+
sed -n '1,/^Valid devices are/d; p' | \
436435
sed ':a; s/ / /g; ta' | \
437436
sed 's/ $//' | \
438437
sed ':a; s/ /\n/g; ta' | \

build/classes/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<opt:booleanOption opt:id="no-c-code-in-asm" opt:name="Hide C code from ASM" opt:desc="Hides your ugly and inefficient c-code from the asm file, so you can always blame the compiler :)" opt:trueemission="--no-c-code-in-asm"/>
2626
<opt:booleanOption opt:id="verbose" opt:name="Verbose actions" opt:desc="Shows the various actions the compiler is performing. " opt:trueemission="--verbose"/>
2727
<opt:booleanOption opt:id="V-show-commands-compiler" opt:name="Verbose commands" opt:desc="Shows the actual commands the compiler is executing." opt:trueemission="-V"/>
28-
<opt:stringListOption opt:id="define-macros" opt:name="Define macros" opt:emissionseparator=" -D" opt:emissionprefix="-D" opt:expr="[A-Za-z_][A-Za-z_0-9]*(=.+)?"/>
28+
<!--opt:stringListOption opt:id="define-macros" opt:name="Define macros" opt:emissionseparator=" -D" opt:emissionprefix="-D" opt:expr="[A-Za-z_][A-Za-z_0-9]*(=.+)?"/-->
2929
</opt:optionCategory>
3030

3131
<opt:optionCategory opt:id="pic14" opt:name="PIC14 exclusive options">
@@ -34,7 +34,7 @@
3434
</opt:optionCategory>
3535

3636
<opt:optionCategory opt:id="pic16" opt:name="PIC16 exclusive options">
37-
<opt:booleanOption opt:id="debug-ralloc" opt:name=" Force register allocator to dump *.d ?les with debugging information." opt:desc="output debugging information" opt:trueemission="--debug-ralloc" opt:booldefault="false"/>
37+
<opt:booleanOption opt:id="debug-ralloc" opt:name="Force register allocator to dump *.d files with debugging information." opt:desc="output debugging information" opt:trueemission="--debug-ralloc" opt:booldefault="false"/>
3838
<opt:enumOption opt:id="pstack-model" opt:name="Stack-size" opt:desc="Defines the stack model to be used." opt:textdefault="" opt:emissionprefix="--pstack-model=" opt:emitswhendefault="false">
3939
<opt:selection opt:text="small" opt:name="Small" opt:desc="Selects small stack model. 8 bit stack and frame pointers. Supports 256 bytes stack size."/>
4040
<opt:selection opt:text="large" opt:name="Large" opt:desc="Selects large stack model. 16 bit stack and frame pointers. Supports 65536 bytes stack size."/>
-81 Bytes
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?><module codename="org.laczik.toolchainSDCC/1">
2-
<module_version install_time="1421103463466" last="true" origin="installer" specification_version="1.0.5">
2+
<module_version install_time="1421105982670" last="true" origin="installer" specification_version="1.0.6">
33
<file crc="1529467185" name="config/Modules/org-laczik-toolchainSDCC.xml"/>
4-
<file crc="56880376" name="modules/org-laczik-toolchainSDCC.jar"/>
4+
<file crc="3190173383" name="modules/org-laczik-toolchainSDCC.jar"/>
55
</module_version>
66
</module>

build/org-laczik-toolchainSDCC.nbm

-25 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 Bytes
Binary file not shown.

manifest.mf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
22
OpenIDE-Module: org.laczik.toolchainSDCC/1
33
OpenIDE-Module-Layer: org/laczik/toolchainSDCC/layer.xml
44
OpenIDE-Module-Localizing-Bundle: org/laczik/toolchainSDCC/Bundle.properties
5-
OpenIDE-Module-Specification-Version: 1.0.5
5+
OpenIDE-Module-Specification-Version: 1.0.6
66

nbproject/private/private.xml

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
<?xml version="1.0" encoding="UTF-8"?><project-private xmlns="http://www.netbeans.org/ns/project-private/1">
22
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
3-
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
4-
<file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/ToDo</file>
5-
<file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/src/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml</file>
6-
<file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/src/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml</file>
7-
<file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/manifest.mf</file>
8-
</open-files>
93
</project-private>
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OpenIDE-Module-Display-Category=Tools
22
OpenIDE-Module-Long-Description=\
3-
The SDCC compiler automatically calls GPUtils tools gpasm and gplink. \
4-
In order to be full functional both tools need to be installed.\n\
3+
The SDCC compiler automatically calls the GPUtils tools gpasm and gplink. \
4+
For it to be fully functional both tools need to be installed.\n\
55
Remember to allow them to set up the path.
66
OpenIDE-Module-Name=SDCC Toolchain
77
OpenIDE-Module-Short-Description=SDCC compiler

src/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<mp:textEmitter mp:text="${RM} ${CURRENT_OBJECT_FILE} ${NEWLINE}"/>
4949
<!-- this is the beginning of the compiler line -->
5050
<mp:textEmitter mp:text="${MP_CC} "/>
51-
<mp:textEmitter mp:text="--debug-ralloc "/>
5251
<mp:optionEmitter mp:idref="sdcc" mp:separator=" "/>
5352
<mp:textEmitter mp:text=" -c"/>
5453
<mp:textEmitter mp:text=" -m${PROCESSOR_FAMILY}"/>
@@ -432,7 +431,7 @@ sed 's#.*# <mp:device mp:name="\0" mp:support="beta"/>#'
432431
<!-- list below generated by
433432
sdcc -v
434433
{ sdcc -mpic16 -phelp dummy.c 2>&1; } | \
435-
sed -n '1,/^Valid devices are (use --verbose for more details)/d; p' | \
434+
sed -n '1,/^Valid devices are/d; p' | \
436435
sed ':a; s/ / /g; ta' | \
437436
sed 's/ $//' | \
438437
sed ':a; s/ /\n/g; ta' | \

src/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<opt:booleanOption opt:id="no-c-code-in-asm" opt:name="Hide C code from ASM" opt:desc="Hides your ugly and inefficient c-code from the asm file, so you can always blame the compiler :)" opt:trueemission="--no-c-code-in-asm"/>
2626
<opt:booleanOption opt:id="verbose" opt:name="Verbose actions" opt:desc="Shows the various actions the compiler is performing. " opt:trueemission="--verbose"/>
2727
<opt:booleanOption opt:id="V-show-commands-compiler" opt:name="Verbose commands" opt:desc="Shows the actual commands the compiler is executing." opt:trueemission="-V"/>
28-
<opt:stringListOption opt:id="define-macros" opt:name="Define macros" opt:emissionseparator=" -D" opt:emissionprefix="-D" opt:expr="[A-Za-z_][A-Za-z_0-9]*(=.+)?"/>
28+
<!--opt:stringListOption opt:id="define-macros" opt:name="Define macros" opt:emissionseparator=" -D" opt:emissionprefix="-D" opt:expr="[A-Za-z_][A-Za-z_0-9]*(=.+)?"/-->
2929
</opt:optionCategory>
3030

3131
<opt:optionCategory opt:id="pic14" opt:name="PIC14 exclusive options">
@@ -34,7 +34,7 @@
3434
</opt:optionCategory>
3535

3636
<opt:optionCategory opt:id="pic16" opt:name="PIC16 exclusive options">
37-
<opt:booleanOption opt:id="debug-ralloc" opt:name=" Force register allocator to dump *.d ?les with debugging information." opt:desc="output debugging information" opt:trueemission="--debug-ralloc" opt:booldefault="false"/>
37+
<opt:booleanOption opt:id="debug-ralloc" opt:name="Force register allocator to dump *.d files with debugging information." opt:desc="output debugging information" opt:trueemission="--debug-ralloc" opt:booldefault="false"/>
3838
<opt:enumOption opt:id="pstack-model" opt:name="Stack-size" opt:desc="Defines the stack model to be used." opt:textdefault="" opt:emissionprefix="--pstack-model=" opt:emitswhendefault="false">
3939
<opt:selection opt:text="small" opt:name="Small" opt:desc="Selects small stack model. 8 bit stack and frame pointers. Supports 256 bytes stack size."/>
4040
<opt:selection opt:text="large" opt:name="Large" opt:desc="Selects large stack model. 16 bit stack and frame pointers. Supports 65536 bytes stack size."/>

0 commit comments

Comments
 (0)