Removed macro definition option

build/classes/org/laczik/toolchainSDCC/Bundle.properties

@@ -1,7 +1,7 @@
 OpenIDE-Module-Display-Category=Tools
 OpenIDE-Module-Long-Description=\
-    The SDCC compiler automatically calls GPUtils tools gpasm and gplink. \
-    In order to be full functional both tools need to be installed.\n\
+    The SDCC compiler automatically calls the GPUtils tools gpasm and gplink. \
+    For it to be fully functional both tools need to be installed.\n\
     Remember to allow them to set up the path.
 OpenIDE-Module-Name=SDCC Toolchain
 OpenIDE-Module-Short-Description=SDCC compiler

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

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

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

@@ -25,7 +25,7 @@
     <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"/>
     <opt:booleanOption opt:id="verbose"                  opt:name="Verbose actions" opt:desc="Shows the various actions the compiler is performing. " opt:trueemission="--verbose"/>
     <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"/>
-    <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]*(=.+)?"/>
+    <!--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]*(=.+)?"/-->
   </opt:optionCategory>
 
   <opt:optionCategory opt:id="pic14" opt:name="PIC14 exclusive options">
@@ -34,7 +34,7 @@
   </opt:optionCategory>
 
   <opt:optionCategory opt:id="pic16" opt:name="PIC16 exclusive options">
-    <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"/>
+    <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"/>
     <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">
       <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."/>
       <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."/>

build/cluster/update_tracking/org-laczik-toolchainSDCC.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><module codename="org.laczik.toolchainSDCC/1">
-    <module_version install_time="1421103463466" last="true" origin="installer" specification_version="1.0.5">
+    <module_version install_time="1421105982670" last="true" origin="installer" specification_version="1.0.6">
         <file crc="1529467185" name="config/Modules/org-laczik-toolchainSDCC.xml"/>
-        <file crc="56880376" name="modules/org-laczik-toolchainSDCC.jar"/>
+        <file crc="3190173383" name="modules/org-laczik-toolchainSDCC.jar"/>
     </module_version>
 </module>

manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.laczik.toolchainSDCC/1
 OpenIDE-Module-Layer: org/laczik/toolchainSDCC/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/laczik/toolchainSDCC/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.5
+OpenIDE-Module-Specification-Version: 1.0.6
 

nbproject/private/private.xml

@@ -1,9 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?><project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/ToDo</file>
-        <file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/src/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml</file>
-        <file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/src/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml</file>
-        <file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/manifest.mf</file>
-    </open-files>
 </project-private>

src/org/laczik/toolchainSDCC/Bundle.properties

@@ -1,7 +1,7 @@
 OpenIDE-Module-Display-Category=Tools
 OpenIDE-Module-Long-Description=\
-    The SDCC compiler automatically calls GPUtils tools gpasm and gplink. \
-    In order to be full functional both tools need to be installed.\n\
+    The SDCC compiler automatically calls the GPUtils tools gpasm and gplink. \
+    For it to be fully functional both tools need to be installed.\n\
     Remember to allow them to set up the path.
 OpenIDE-Module-Name=SDCC Toolchain
 OpenIDE-Module-Short-Description=SDCC compiler

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

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

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

@@ -25,7 +25,7 @@
     <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"/>
     <opt:booleanOption opt:id="verbose"                  opt:name="Verbose actions" opt:desc="Shows the various actions the compiler is performing. " opt:trueemission="--verbose"/>
     <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"/>
-    <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]*(=.+)?"/>
+    <!--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]*(=.+)?"/-->
   </opt:optionCategory>
 
   <opt:optionCategory opt:id="pic14" opt:name="PIC14 exclusive options">
@@ -34,7 +34,7 @@
   </opt:optionCategory>
 
   <opt:optionCategory opt:id="pic16" opt:name="PIC16 exclusive options">
-    <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"/>
+    <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"/>
     <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">
       <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."/>
       <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."/>