pikloops-svn Mailing List for PikLoops: a code generator for delay (Page 3)
Brought to you by:
dionysos-sf
Menu
▾
▴
pikloops-svn — A list to follow the svn commit
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(34) |
Aug
(1) |
Sep
(34) |
Oct
(67) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
|
Dec
(1) |
|
From: <dio...@us...> - 2007-10-16 08:07:38
|
Revision: 150
http://pikloops.svn.sourceforge.net/pikloops/?rev=150&view=rev
Author: dionysos-sf
Date: 2007-10-16 01:07:43 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
GnuPG logo
Added Paths:
-----------
web/trunk/images/logos/gnupg-logo-icon-36x36.png
Added: web/trunk/images/logos/gnupg-logo-icon-36x36.png
===================================================================
(Binary files differ)
Property changes on: web/trunk/images/logos/gnupg-logo-icon-36x36.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-15 21:46:16
|
Revision: 149
http://pikloops.svn.sourceforge.net/pikloops/?rev=149&view=rev
Author: dionysos-sf
Date: 2007-10-15 14:46:19 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Add trailing point, fix copyright.
Modified Paths:
--------------
prog/trunk/po/es.po
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2007-10-15 21:36:28 UTC (rev 148)
+++ prog/trunk/po/es.po 2007-10-15 21:46:19 UTC (rev 149)
@@ -9,8 +9,8 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-10-15 19:07+0200\n"
"PO-Revision-Date: 2007-10-15 22:07+0200\n"
-"Last-Translator: Alain PORTAL <ap...@un...>\n"
-"Language-Team: Français <tr...@tr...>\n"
+"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
+"Language-Team: Spanish <tra...@es...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -111,7 +111,7 @@
#: mainwidgetpl.cpp:127
msgid "PikLoops was unable to calculate the delay you requested.\n"
-msgstr "PikLoops no pudo calcular el retraso que solicitó \n"
+msgstr "PikLoops no pudo calcular el retraso que solicitó.\n"
#: mainwidgetpl.cpp:131
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ca...@us...> - 2007-10-15 21:36:28
|
Revision: 148
http://pikloops.svn.sourceforge.net/pikloops/?rev=148&view=rev
Author: carcam
Date: 2007-10-15 14:36:28 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Spanish translation up to date
Modified Paths:
--------------
prog/trunk/po/es.po
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2007-10-15 17:24:57 UTC (rev 147)
+++ prog/trunk/po/es.po 2007-10-15 21:36:28 UTC (rev 148)
@@ -8,14 +8,13 @@
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-10-15 19:07+0200\n"
-"PO-Revision-Date: 2007-10-15 19:05+0200\n"
+"PO-Revision-Date: 2007-10-15 22:07+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: "
#: main.cpp:30
msgid "Pic Delay Calculator"
@@ -112,17 +111,17 @@
#: mainwidgetpl.cpp:127
msgid "PikLoops was unable to calculate the delay you requested.\n"
-msgstr ""
+msgstr "PikLoops no pudo calcular el retraso que solicitó \n"
#: mainwidgetpl.cpp:131
#, c-format
msgid "The greatest delay you can get don't have to exceed %1s"
-msgstr ""
+msgstr "El mayor retraso que puede obtener no debe superar %1s"
#: mainwidgetpl.cpp:136
#, c-format
msgid "The lowest delay you can get have to be greater than %1s"
-msgstr ""
+msgstr "El menor retraseo que puede obtener no puede ser mayor de %1s"
#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
msgid "CounterC"
@@ -153,3 +152,4 @@
#: pikloops.cpp:52
msgid "Ca&lculate"
msgstr "Ca&lcular"
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-15 17:24:53
|
Revision: 147
http://pikloops.svn.sourceforge.net/pikloops/?rev=147&view=rev
Author: dionysos-sf
Date: 2007-10-15 10:24:57 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Update strings.
Modified Paths:
--------------
prog/trunk/po/de.po
prog/trunk/po/es.po
prog/trunk/po/fr.po
prog/trunk/po/pikloops.pot
Modified: prog/trunk/po/de.po
===================================================================
--- prog/trunk/po/de.po 2007-10-15 17:24:26 UTC (rev 146)
+++ prog/trunk/po/de.po 2007-10-15 17:24:57 UTC (rev 147)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-11 17:22+0200\n"
-"PO-Revision-Date: 2007-10-11 17:27+0200\n"
+"POT-Creation-Date: 2007-10-15 19:07+0200\n"
+"PO-Revision-Date: 2007-10-15 19:06+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -15,16 +15,6 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. i18n: file pikloopsui.rc line 4
-#: rc.cpp:3
-#, no-c-format
-msgid "&Actions"
-msgstr "&Aktionen "
-
-#: pikloops.cpp:52
-msgid "Ca&lculate"
-msgstr "&Berechne "
-
#: main.cpp:30
msgid "Pic Delay Calculator"
msgstr "Pic Verzögerungs Berechner"
@@ -49,18 +39,12 @@
"Ursprünglicher PicLoops Autor für Windows.\n"
" Seine Berechnungsformulare haben es möglich gemacht"
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Lukas Brausch"
+#. i18n: file pikloopsui.rc line 4
+#: rc.cpp:3
+#, no-c-format
+msgid "&Actions"
+msgstr "&Aktionen "
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gro...@ar..."
-
#: mainwidgetpl.cpp:47
msgid "Actual delay: %1 s (%2 clock cycles)."
msgstr "Aktuelle Verzögerung: %1 s (%2 Zyklen)."
@@ -95,43 +79,75 @@
msgid "delay_"
msgstr "delay_"
-#: mainwidgetpl.cpp:103
+#: mainwidgetpl.cpp:103 mainwidgetpl.cpp:107
msgid "_sec"
msgstr "_sec"
-#: mainwidgetpl.cpp:104
+#: mainwidgetpl.cpp:104 mainwidgetpl.cpp:108
msgid "_loop"
msgstr "_loop"
-#: mainwidgetpl.cpp:107
-msgid "; Delay code generated by PikLoops ("
-msgstr "; Laufzeit Code generiert von PikLoops ("
+#: mainwidgetpl.cpp:105
+#, fuzzy
+msgid "sub_delay_"
+msgstr "delay_"
-#: mainwidgetpl.cpp:108
+#: mainwidgetpl.cpp:112
+msgid "Delay code generated by PikLoops"
+msgstr "Laufzeit Code generiert von PikLoops"
+
+#: mainwidgetpl.cpp:114
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "ddd yyyy-MMM-dd hh:mm:ss"
-#: mainwidgetpl.cpp:111
+#: mainwidgetpl.cpp:117
msgid ""
-"; Time Delay = %1s with Osc = %2MHz\n"
+"Time Delay = %1s with Osc = %2MHz\n"
"\n"
msgstr ""
-"; Zeitverzögerung = %1s mit Osc = %2MHz\n"
+"Zeitverzögerung = %1s mit Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:120 mainwidgetpl.cpp:160
-msgid "CounterD"
-msgstr "ZählerD"
+#: mainwidgetpl.cpp:127
+msgid "PikLoops was unable to calculate the delay you requested.\n"
+msgstr ""
-#: mainwidgetpl.cpp:126 mainwidgetpl.cpp:155
+#: mainwidgetpl.cpp:131
+#, c-format
+msgid "The greatest delay you can get don't have to exceed %1s"
+msgstr ""
+
+#: mainwidgetpl.cpp:136
+#, c-format
+msgid "The lowest delay you can get have to be greater than %1s"
+msgstr ""
+
+#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
msgid "CounterC"
msgstr "ZählerC"
-#: mainwidgetpl.cpp:132 mainwidgetpl.cpp:150
+#: mainwidgetpl.cpp:161 mainwidgetpl.cpp:173 mainwidgetpl.cpp:180
+#: mainwidgetpl.cpp:192
msgid "CounterB"
msgstr "ZählerB"
-#: mainwidgetpl.cpp:139 mainwidgetpl.cpp:144
+#: mainwidgetpl.cpp:165 mainwidgetpl.cpp:170 mainwidgetpl.cpp:184
+#: mainwidgetpl.cpp:189 mainwidgetpl.cpp:199 mainwidgetpl.cpp:204
msgid "CounterA"
msgstr "ZählerA"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Lukas Brausch"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gro...@ar..."
+
+#: pikloops.cpp:52
+msgid "Ca&lculate"
+msgstr "&Berechne "
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2007-10-15 17:24:26 UTC (rev 146)
+++ prog/trunk/po/es.po 2007-10-15 17:24:57 UTC (rev 147)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-11 17:22+0200\n"
-"PO-Revision-Date: 2007-10-11 17:26+0200\n"
+"POT-Creation-Date: 2007-10-15 19:07+0200\n"
+"PO-Revision-Date: 2007-10-15 19:05+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -17,16 +17,6 @@
"Plural-Forms: \n"
"X-Generator: KBabel 1.11.4\n"
-#. i18n: file pikloopsui.rc line 4
-#: rc.cpp:3
-#, no-c-format
-msgid "&Actions"
-msgstr "&Acciones"
-
-#: pikloops.cpp:52
-msgid "Ca&lculate"
-msgstr "Ca&lcular"
-
#: main.cpp:30
msgid "Pic Delay Calculator"
msgstr "Cálculo del retraso del Pic"
@@ -51,18 +41,12 @@
"Autor del PicLoops original para Windows \n"
"Sus fórmulas de cálculo lo hicieron posible."
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Carlos M. Cámara Mora"
+#. i18n: file pikloopsui.rc line 4
+#: rc.cpp:3
+#, no-c-format
+msgid "&Actions"
+msgstr "&Acciones"
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "cmcamara+PIKLOOPS AT gmail DOT com"
-
#: mainwidgetpl.cpp:47
msgid "Actual delay: %1 s (%2 clock cycles)."
msgstr "Retraso actual: %1 s (%2 ciclos de reloj)"
@@ -97,43 +81,75 @@
msgid "delay_"
msgstr "retraso_"
-#: mainwidgetpl.cpp:103
+#: mainwidgetpl.cpp:103 mainwidgetpl.cpp:107
msgid "_sec"
msgstr "_seg"
-#: mainwidgetpl.cpp:104
+#: mainwidgetpl.cpp:104 mainwidgetpl.cpp:108
msgid "_loop"
msgstr "_bucle"
-#: mainwidgetpl.cpp:107
-msgid "; Delay code generated by PikLoops ("
-msgstr "; Código de retardo generado por PikLoops ("
+#: mainwidgetpl.cpp:105
+#, fuzzy
+msgid "sub_delay_"
+msgstr "retraso_"
-#: mainwidgetpl.cpp:108
+#: mainwidgetpl.cpp:112
+msgid "Delay code generated by PikLoops"
+msgstr "Código de retardo generado por PikLoops"
+
+#: mainwidgetpl.cpp:114
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "ddd MMM-yyyy-dd hh:mm:ss"
-#: mainwidgetpl.cpp:111
+#: mainwidgetpl.cpp:117
msgid ""
-"; Time Delay = %1s with Osc = %2MHz\n"
+"Time Delay = %1s with Osc = %2MHz\n"
"\n"
msgstr ""
-"; Tiempo de retardo = %1 con Osc = %2MHz\n"
+"Tiempo de retardo = %1 con Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:120 mainwidgetpl.cpp:160
-msgid "CounterD"
-msgstr "ContadorD"
+#: mainwidgetpl.cpp:127
+msgid "PikLoops was unable to calculate the delay you requested.\n"
+msgstr ""
-#: mainwidgetpl.cpp:126 mainwidgetpl.cpp:155
+#: mainwidgetpl.cpp:131
+#, c-format
+msgid "The greatest delay you can get don't have to exceed %1s"
+msgstr ""
+
+#: mainwidgetpl.cpp:136
+#, c-format
+msgid "The lowest delay you can get have to be greater than %1s"
+msgstr ""
+
+#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
msgid "CounterC"
msgstr "ContadorC"
-#: mainwidgetpl.cpp:132 mainwidgetpl.cpp:150
+#: mainwidgetpl.cpp:161 mainwidgetpl.cpp:173 mainwidgetpl.cpp:180
+#: mainwidgetpl.cpp:192
msgid "CounterB"
msgstr "ContadorB"
-#: mainwidgetpl.cpp:139 mainwidgetpl.cpp:144
+#: mainwidgetpl.cpp:165 mainwidgetpl.cpp:170 mainwidgetpl.cpp:184
+#: mainwidgetpl.cpp:189 mainwidgetpl.cpp:199 mainwidgetpl.cpp:204
msgid "CounterA"
msgstr "ContadorA"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Carlos M. Cámara Mora"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "cmcamara+PIKLOOPS AT gmail DOT com"
+
+#: pikloops.cpp:52
+msgid "Ca&lculate"
+msgstr "Ca&lcular"
Modified: prog/trunk/po/fr.po
===================================================================
--- prog/trunk/po/fr.po 2007-10-15 17:24:26 UTC (rev 146)
+++ prog/trunk/po/fr.po 2007-10-15 17:24:57 UTC (rev 147)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-11 17:22+0200\n"
-"PO-Revision-Date: 2007-10-11 17:25+0200\n"
+"POT-Creation-Date: 2007-10-15 19:07+0200\n"
+"PO-Revision-Date: 2007-10-15 19:08+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -15,16 +15,6 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. i18n: file pikloopsui.rc line 4
-#: rc.cpp:3
-#, no-c-format
-msgid "&Actions"
-msgstr "&Actions"
-
-#: pikloops.cpp:52
-msgid "Ca&lculate"
-msgstr "Ca&lculer"
-
#: main.cpp:30
msgid "Pic Delay Calculator"
msgstr "Calculateur de temporisation pour Pic"
@@ -49,18 +39,12 @@
"Auteur original de Picloops pour Windows.\n"
"Ses formules de calcul l'ont rendu possible."
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Alain Portal"
+#. i18n: file pikloopsui.rc line 4
+#: rc.cpp:3
+#, no-c-format
+msgid "&Actions"
+msgstr "&Actions"
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "aportal AT univ-montp2 DOT fr"
-
#: mainwidgetpl.cpp:47
msgid "Actual delay: %1 s (%2 clock cycles)."
msgstr "Temporisation actuelle : %1 s (%2 cycles d'horloge)"
@@ -97,43 +81,77 @@
msgid "delay_"
msgstr "temporisation_"
-#: mainwidgetpl.cpp:103
+#: mainwidgetpl.cpp:103 mainwidgetpl.cpp:107
msgid "_sec"
msgstr "_sec"
-#: mainwidgetpl.cpp:104
+#: mainwidgetpl.cpp:104 mainwidgetpl.cpp:108
msgid "_loop"
msgstr "_boucle"
-#: mainwidgetpl.cpp:107
-msgid "; Delay code generated by PikLoops ("
-msgstr "; Code de temporisation généré par PikLoops ("
+#: mainwidgetpl.cpp:105
+msgid "sub_delay_"
+msgstr "sous_temporisation_"
-#: mainwidgetpl.cpp:108
+#: mainwidgetpl.cpp:112
+msgid "Delay code generated by PikLoops"
+msgstr "Code de temporisation généré par PikLoops"
+
+#: mainwidgetpl.cpp:114
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr "dddd dd MMMM yyyy hh:mm:ss"
-#: mainwidgetpl.cpp:111
+#: mainwidgetpl.cpp:117
msgid ""
-"; Time Delay = %1s with Osc = %2MHz\n"
+"Time Delay = %1s with Osc = %2MHz\n"
"\n"
msgstr ""
-"; Durée temporisation = %1s avec Osc = %2MHz\n"
+"Durée temporisation = %1s avec Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:120 mainwidgetpl.cpp:160
-msgid "CounterD"
-msgstr "Compteur_D"
+#: mainwidgetpl.cpp:127
+msgid "PikLoops was unable to calculate the delay you requested.\n"
+msgstr ""
+"Pikloops n'a pas été capable de calculer la temporisation que vous "
+"souhaitiez.\n"
-#: mainwidgetpl.cpp:126 mainwidgetpl.cpp:155
+#: mainwidgetpl.cpp:131
+#, c-format
+msgid "The greatest delay you can get don't have to exceed %1s"
+msgstr "La plus grande temporisation que vous pouvez obtenir ne doit pas excéder %1s"
+
+#: mainwidgetpl.cpp:136
+#, c-format
+msgid "The lowest delay you can get have to be greater than %1s"
+msgstr "La plus petite temporisation que vous pouvez obtenir doit être supérieure à %1s"
+
+#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
msgid "CounterC"
msgstr "Compteur_C"
-#: mainwidgetpl.cpp:132 mainwidgetpl.cpp:150
+#: mainwidgetpl.cpp:161 mainwidgetpl.cpp:173 mainwidgetpl.cpp:180
+#: mainwidgetpl.cpp:192
msgid "CounterB"
msgstr "Compteur_B"
-#: mainwidgetpl.cpp:139 mainwidgetpl.cpp:144
+#: mainwidgetpl.cpp:165 mainwidgetpl.cpp:170 mainwidgetpl.cpp:184
+#: mainwidgetpl.cpp:189 mainwidgetpl.cpp:199 mainwidgetpl.cpp:204
msgid "CounterA"
msgstr "Compteur_A"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Alain Portal"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "aportal AT univ-montp2 DOT fr"
+
+#: pikloops.cpp:52
+msgid "Ca&lculate"
+msgstr "Ca&lculer"
+
Modified: prog/trunk/po/pikloops.pot
===================================================================
--- prog/trunk/po/pikloops.pot 2007-10-15 17:24:26 UTC (rev 146)
+++ prog/trunk/po/pikloops.pot 2007-10-15 17:24:57 UTC (rev 147)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-11 17:22+0200\n"
+"POT-Creation-Date: 2007-10-15 19:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -15,16 +15,6 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. i18n: file pikloopsui.rc line 4
-#: rc.cpp:3
-#, no-c-format
-msgid "&Actions"
-msgstr ""
-
-#: pikloops.cpp:52
-msgid "Ca&lculate"
-msgstr ""
-
#: main.cpp:30
msgid "Pic Delay Calculator"
msgstr ""
@@ -47,18 +37,12 @@
"His Calculations Formulas made it possible."
msgstr ""
-#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
+#. i18n: file pikloopsui.rc line 4
+#: rc.cpp:3
+#, no-c-format
+msgid "&Actions"
msgstr ""
-#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
#: mainwidgetpl.cpp:47
msgid "Actual delay: %1 s (%2 clock cycles)."
msgstr ""
@@ -91,40 +75,72 @@
msgid "delay_"
msgstr ""
-#: mainwidgetpl.cpp:103
+#: mainwidgetpl.cpp:103 mainwidgetpl.cpp:107
msgid "_sec"
msgstr ""
-#: mainwidgetpl.cpp:104
+#: mainwidgetpl.cpp:104 mainwidgetpl.cpp:108
msgid "_loop"
msgstr ""
-#: mainwidgetpl.cpp:107
-msgid "; Delay code generated by PikLoops ("
+#: mainwidgetpl.cpp:105
+msgid "sub_delay_"
msgstr ""
-#: mainwidgetpl.cpp:108
+#: mainwidgetpl.cpp:112
+msgid "Delay code generated by PikLoops"
+msgstr ""
+
+#: mainwidgetpl.cpp:114
msgid "ddd yyyy-MMM-dd hh:mm:ss"
msgstr ""
-#: mainwidgetpl.cpp:111
+#: mainwidgetpl.cpp:117
msgid ""
-"; Time Delay = %1s with Osc = %2MHz\n"
+"Time Delay = %1s with Osc = %2MHz\n"
"\n"
msgstr ""
-#: mainwidgetpl.cpp:120 mainwidgetpl.cpp:160
-msgid "CounterD"
+#: mainwidgetpl.cpp:127
+msgid "PikLoops was unable to calculate the delay you requested.\n"
msgstr ""
-#: mainwidgetpl.cpp:126 mainwidgetpl.cpp:155
+#: mainwidgetpl.cpp:131
+#, c-format
+msgid "The greatest delay you can get don't have to exceed %1s"
+msgstr ""
+
+#: mainwidgetpl.cpp:136
+#, c-format
+msgid "The lowest delay you can get have to be greater than %1s"
+msgstr ""
+
+#: mainwidgetpl.cpp:145 mainwidgetpl.cpp:153
msgid "CounterC"
msgstr ""
-#: mainwidgetpl.cpp:132 mainwidgetpl.cpp:150
+#: mainwidgetpl.cpp:161 mainwidgetpl.cpp:173 mainwidgetpl.cpp:180
+#: mainwidgetpl.cpp:192
msgid "CounterB"
msgstr ""
-#: mainwidgetpl.cpp:139 mainwidgetpl.cpp:144
+#: mainwidgetpl.cpp:165 mainwidgetpl.cpp:170 mainwidgetpl.cpp:184
+#: mainwidgetpl.cpp:189 mainwidgetpl.cpp:199 mainwidgetpl.cpp:204
msgid "CounterA"
msgstr ""
+
+#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: pikloops.cpp:52
+msgid "Ca&lculate"
+msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-15 17:24:28
|
Revision: 146
http://pikloops.svn.sourceforge.net/pikloops/?rev=146&view=rev
Author: dionysos-sf
Date: 2007-10-15 10:24:26 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
- Fix bug in calculation
- Remove CounterD
- New delay management
- Update copyright
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
prog/trunk/src/pikdelay.cpp
prog/trunk/src/pikdelay.h
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-15 08:16:59 UTC (rev 145)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-15 17:24:26 UTC (rev 146)
@@ -1,6 +1,6 @@
/**
- * Copyright (C) 2004 by JAVIER FERNANDO VARGAS G
- * fer...@ca...
+ * Copyright (C) 2004 by JAVIER FERNANDO VARGAS G <fer...@ca...>
+ * 2007 - Alain Portal <aportal AT univ-montp2 DOT fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -102,67 +102,110 @@
routineName += delay->text() ;
routineName += i18n("_sec") ;
QString loopName = routineName + i18n("_loop") ;
+ QString subRoutineName = i18n("sub_delay_") ;
+ subRoutineName += delay->text() ;
+ subRoutineName += i18n("_sec") ;
+ QString loopSubRoutineName = subRoutineName + i18n("_loop") ;
// generate comments
- QString tmpCode(i18n("; Delay code generated by PikLoops (")) ;
+ QString tmpCode = "; " ;
+ tmpCode += i18n("Delay code generated by PikLoops") ;
+ tmpCode += " (" ;
tmpCode += QDateTime::currentDateTime().toString(i18n("ddd yyyy-MMM-dd hh:mm:ss")) ;
- tmpCode += ")\n" ;
+ tmpCode += ")\n; " ;
- tmpCode += QString(i18n("; Time Delay = %1s with Osc = %2MHz\n\n")).
+ tmpCode += QString(i18n("Time Delay = %1s with Osc = %2MHz\n\n")).
arg(loopValues->getTimeDelay(),0,'f',8).arg(loopValues->getClockFrequency(),0,'f',8);
tmpCode += routineName ;
tmpCode += "\n" ;
- if ( loopValues->getCounterD() != -1 ) {
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterD(),0,10);
- tmpCode += QString("\tmovwf\t");
- tmpCode += QString(i18n("CounterD"));
- tmpCode += "\n";
+ if ( loopValues->getCounterC() == -1 &&
+ loopValues->getCounterB() == -1 &&
+ loopValues->getCounterA() == -1 ) {
+ tmpCode += "\n; ";
+ tmpCode += i18n("PikLoops was unable to calculate the delay you requested.\n");
+ if ( loopValues->isOverflow() == 1 ) {
+ double maxDelay = ( 4.0 * MACHINE_CYCLE_MAX ) / ( loopValues->getClockFrequency() * 1000000.0 ) ;
+ tmpCode += "; ";
+ tmpCode += QString(i18n("The greatest delay you can get don't have to exceed %1s").arg(maxDelay,0,'f',8)) ;
+ }
+ else {
+ double minDelay = ( 4.0 * MACHINE_CYCLE_MIN ) / ( loopValues->getClockFrequency() * 1000000.0 ) ;
+ tmpCode += "; ";
+ tmpCode += QString(i18n("The lowest delay you can get have to be greater than %1s").arg(minDelay,0,'f',8)) ;
+ }
}
+ else {
+
+
if ( loopValues->getCounterC() != -1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
tmpCode += QString("\tmovwf\t");
tmpCode += QString(i18n("CounterC"));
tmpCode += "\n";
+ tmpCode += loopName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tcall\t");
+ tmpCode += subRoutineName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterC"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ tmpCode += QString("\treturn\n");
+ tmpCode += "\n" ;
+ tmpCode += subRoutineName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += "\n";
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += "\n";
+ tmpCode += loopSubRoutineName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopSubRoutineName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopSubRoutineName);
+ tmpCode += QString("\treturn\n");
}
- if ( loopValues->getCounterB() !=-1 ) {
+ else if ( loopValues->getCounterB() !=-1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
tmpCode += QString("\tmovwf\t");
tmpCode += QString(i18n("CounterB"));
tmpCode += "\n";
- }
-
- if ( loopValues->getCounterA() !=-1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
tmpCode += QString("\tmovwf\t");
tmpCode += QString(i18n("CounterA"));
- tmpCode += "\n\n";
+ tmpCode += "\n";
tmpCode += loopName ;
tmpCode += "\n" ;
tmpCode += QString("\tdecfsz\t");
tmpCode += QString(i18n("CounterA"));
tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
- }
-
- if ( loopValues->getCounterB() != -1 ) {
tmpCode += QString("\tdecfsz\t");
tmpCode += QString(i18n("CounterB"));
tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ tmpCode += QString("\treturn\n");
}
- if ( loopValues->getCounterC() !=-1 ) {
+ else if ( loopValues->getCounterA() !=-1 ) {
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += "\n";
+ tmpCode += loopName ;
+ tmpCode += "\n" ;
tmpCode += QString("\tdecfsz\t");
- tmpCode += QString(i18n("CounterC"));
+ tmpCode += QString(i18n("CounterA"));
tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ tmpCode += QString("\treturn\n");
}
- if ( loopValues->getCounterD() !=-1 ) {
- tmpCode += QString("\tdecfsz\t");
- tmpCode += QString(i18n("CounterD"));
- tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
}
-
- tmpCode += QString("\treturn\n");
-
// update status line
cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'f',8)
.arg((loopValues->getMachineCycles()),0,'f',0) ) ;
Modified: prog/trunk/src/pikdelay.cpp
===================================================================
--- prog/trunk/src/pikdelay.cpp 2007-10-15 08:16:59 UTC (rev 145)
+++ prog/trunk/src/pikdelay.cpp 2007-10-15 17:24:26 UTC (rev 146)
@@ -1,6 +1,6 @@
/**
- * Copyright (C) 2004 by JAVIER FERNANDO VARGAS G
- * fer...@ca...
+ * Copyright (C) 2004 by JAVIER FERNANDO VARGAS G <fer...@ca...>
+ * 2007 - Alain Portal <aportal AT univ-montp2 DOT fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
#include "pikdelay.h"
#include <math.h>
+
PiKDelay::PiKDelay(double ClkF, double TmDly)
{
setClockFrequency(ClkF);
@@ -35,63 +36,50 @@
{
}
-
/*!
\fn PiKDelay::Refresh()
*/
void PiKDelay::Refresh()
{
- CounterA = CounterB = CounterC = CounterD = -1;
+ CounterA = CounterB = CounterC = -1;
+ Overflow = 0 ;
MachineCycleTime = 4.0/(ClockFrequency*1000000.0);
MachineCycles = floor(TimeDelay/MachineCycleTime);
- if ( MachineCycles <= 766.0 ) {
- CounterA = static_cast<int> ((MachineCycles-1.0)/3.0);
- MachineCycles = 1 + (3*CounterA);
-
- if ( CounterA == 256 ) {
- CounterA = 0;
- }
+ if ( MachineCycles < MACHINE_CYCLE_MIN ) {
}
- if ( MachineCycles > 766.0 && MachineCycles <= 196350.0 ) {
- CounterB = static_cast<int>((MachineCycles + 765.0)/770.0);
- CounterA = static_cast<int>((MachineCycles + 765.0 - (770.0 * CounterB))/3.0);
- MachineCycles = (3.0 * CounterA) + (770.0 * CounterB) - 765.0;
+ else if ( MachineCycles <= 771.0 ) {
+ CounterA = static_cast<int> ( ( MachineCycles / 3.0 ) - 1.0 );
+ MachineCycles = 3 * ( CounterA + 1 );
+ /* To make gpasm happy */
if ( CounterA == 256 ) {
CounterA = 0;
}
- if ( CounterB == 256 ) {
- CounterB = 0;
- }
}
- if ( MachineCycles > 196350.0 && MachineCycles <= 50070524.0 ) {
- CounterC = static_cast<int>((MachineCycles + 197116.0)/196355.0);
- CounterB = static_cast<int>((MachineCycles + 197116.0 - (196355.0 * CounterC))/770.0);
- CounterA = static_cast<int>((MachineCycles + 197116.0 - (196355.0 * CounterC) - (770.0 * CounterB))/3.0);
- MachineCycles = (3.0 * CounterA) + (770.0 * CounterB) + (196355.0 * CounterC) - 197116.0;
+ else if ( MachineCycles <= 197125.0 ) {
+ CounterB = static_cast<int> ( ( MachineCycles + 763.0 ) / 770.0 );
+ CounterA = static_cast<int> ( ( MachineCycles + 763.0 - ( 770.0 * CounterB ) ) / 3.0 );
+ MachineCycles = ( 3.0 * CounterA ) + ( 770.0 * CounterB ) - 763.0;
+ /* To make gpasm happy */
if ( CounterA == 256 ) {
CounterA = 0;
}
if ( CounterB == 256 ) {
CounterB = 0;
}
- if ( CounterC == 256 ) {
- CounterC = 0;
- }
}
- if ( MachineCycles > 50070524.0 && MachineCycles <= 12767985148.0 ) {
- CounterD = static_cast<int>((MachineCycles + 50267642.0)/50070530.0);
- CounterC = static_cast<int>((MachineCycles + 50267642.0 - (50070530.0 * CounterD))/196355.0);
- CounterB = static_cast<int>((MachineCycles + 50267642.0 - (50070530.0 * CounterD) - (196355.0 * CounterC))/770.0);
- CounterA = static_cast<int>((MachineCycles + 50267642.0 - (50070530.0 * CounterD) - (196355.0 * CounterC) - (CounterB * 770.0))/3.0);
+ else if ( MachineCycles <= MACHINE_CYCLE_MAX ) {
+ CounterC = static_cast<int> ( ( MachineCycles - 3.0 ) / 197125.0 + 1.0 );
+ CounterB = static_cast<int> ( ( ( MachineCycles - 3.0 ) / CounterC + 758.0 ) / 770.0 );
+ CounterA = static_cast<int> ( ( ( MachineCycles - 3.0 ) / CounterC + 758.0 - 770.0 * CounterB ) / 3.0 );
+ MachineCycles = ( 3.0 * CounterA + 770.0 * CounterB - 758.0 ) * CounterC + 3.0;
- MachineCycles = (3.0 * CounterA) + (770.0 * CounterB) + (196355.0 * CounterC) + (50070530.0 * CounterD) - 50267642.0;
-
+ /* To make gpasm happy */
if ( CounterA == 256 ) {
CounterA = 0;
}
@@ -101,14 +89,10 @@
if ( CounterC == 256 ) {
CounterC = 0;
}
- if ( CounterD == 256 ) {
- CounterD = 0;
- }
}
- /*Waitting for correction*/
- if ( MachineCycles > 12767985148.0 ) {
-
+ else {
+ Overflow = 1;
}
TimeDelay = MachineCycles * MachineCycleTime;
@@ -121,10 +105,10 @@
void PiKDelay::setClockFrequency(double CF)
{
if ( CF > 0 ) {
- ClockFrequency = CF;
+ ClockFrequency = CF;
}
else {
- ClockFrequency = 4.00;
+ ClockFrequency = 4.00;
}
}
@@ -135,10 +119,10 @@
void PiKDelay::setTimeDelay(double TD)
{
if (TD >= 0) {
- TimeDelay = TD;
+ TimeDelay = TD;
}
else {
- TimeDelay = 1.00;
+ TimeDelay = 1.00;
}
}
@@ -198,10 +182,9 @@
/*!
- \fn PiKDelay::getCounterD()
+ \fn PiKDelay::isOverflow()
*/
-int PiKDelay::getCounterD()
+int PiKDelay::isOverflow()
{
- return CounterD;
+ return Overflow;
}
-
Modified: prog/trunk/src/pikdelay.h
===================================================================
--- prog/trunk/src/pikdelay.h 2007-10-15 08:16:59 UTC (rev 145)
+++ prog/trunk/src/pikdelay.h 2007-10-15 17:24:26 UTC (rev 146)
@@ -1,6 +1,6 @@
/**
- * Copyright (C) 2004 by JAVIER FERNANDO VARGAS G
- * fer...@ca...
+ * Copyright (C) 2004 by JAVIER FERNANDO VARGAS G <fer...@ca...>
+ * 2007 - Alain Portal <aportal AT univ-montp2 DOT fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,6 +22,9 @@
#ifndef PIKDELAY_H
#define PIKDELAY_H
+#define MACHINE_CYCLE_MIN 6.0
+#define MACHINE_CYCLE_MAX 50464002.0
+
/**
* @author JAVIER FERNANDO VARGAS GONZALEZ
*
@@ -40,18 +43,19 @@
int getCounterA();
int getCounterB();
int getCounterC();
- int getCounterD();
+ int isOverflow();
void Refresh();
+
private:
double ClockFrequency;
double TimeDelay;
double MachineCycles;
+ double MachineCycleTime;
int CounterA;
int CounterB;
int CounterC;
- int CounterD;
- double MachineCycleTime;
+ int Overflow;
};
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-15 08:16:58
|
Revision: 145
http://pikloops.svn.sourceforge.net/pikloops/?rev=145&view=rev
Author: dionysos-sf
Date: 2007-10-15 01:16:59 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Remove Education category, add Engineering category.
Modified Paths:
--------------
prog/trunk/src/pikloops.desktop
Modified: prog/trunk/src/pikloops.desktop
===================================================================
--- prog/trunk/src/pikloops.desktop 2007-10-11 15:29:50 UTC (rev 144)
+++ prog/trunk/src/pikloops.desktop 2007-10-15 08:16:59 UTC (rev 145)
@@ -5,7 +5,7 @@
Icon=pikloops
Type=Application
Terminal=false
-Categories=Qt;KDE;Education;Science;Electronics
+Categories=Qt;KDE;Electronics;Engineering;Science;
Comment=Code generator for PIC delays
Comment[de]=PIC Verzögerungs Berechner
Comment[es]=Cálculo del retraso del PIC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 15:29:49
|
Revision: 144
http://pikloops.svn.sourceforge.net/pikloops/?rev=144&view=rev
Author: dionysos-sf
Date: 2007-10-11 08:29:50 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Update strings
Modified Paths:
--------------
prog/trunk/po/de.po
prog/trunk/po/es.po
prog/trunk/po/fr.po
prog/trunk/po/pikloops.pot
Modified: prog/trunk/po/de.po
===================================================================
--- prog/trunk/po/de.po 2007-10-11 15:07:42 UTC (rev 143)
+++ prog/trunk/po/de.po 2007-10-11 15:29:50 UTC (rev 144)
@@ -1,18 +1,19 @@
+# translation of de.po to Français
+#
# Lukas Brausch <gro...@ar...>, 2007.
-# , fuzzy
-#
-#
+# Alain PORTAL <ap...@un...>, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-24 10:12+0200\n"
-"PO-Revision-Date: 2007-07-19 13:26+0200\n"
-"Last-Translator: Lukas Brausch <gro...@ar...>\n"
-"Language-Team: German\n"
+"POT-Creation-Date: 2007-10-11 17:22+0200\n"
+"PO-Revision-Date: 2007-10-11 17:27+0200\n"
+"Last-Translator: Alain PORTAL <ap...@un...>\n"
+"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. i18n: file pikloopsui.rc line 4
#: rc.cpp:3
@@ -72,19 +73,19 @@
msgid "Frequency (MHz)"
msgstr "Frequenz (MHz)"
-#: mainwidgetpl.cpp:61
+#: mainwidgetpl.cpp:62
msgid "Select a standard device clock, or type a custom clock frequency."
msgstr "Wähle eine Standard Uhr aus oder gib eine Frequenz ein "
-#: mainwidgetpl.cpp:64
+#: mainwidgetpl.cpp:65
msgid "Needed delay (s)"
msgstr "Benötigte Verzögerung(en)"
-#: mainwidgetpl.cpp:70
+#: mainwidgetpl.cpp:71
msgid "Ouput data"
msgstr "Ausgabe Daten"
-#: mainwidgetpl.cpp:72
+#: mainwidgetpl.cpp:73
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
"Kopiere diesen Code oder füge ihn durch \"drag and drop\" in deinen Editor "
@@ -118,54 +119,19 @@
"; Zeitverzögerung = %1s mit Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:119
-msgid "\tmovwf \tCounterD\n"
-msgstr "\tmovwf \tZählerD\n"
+#: mainwidgetpl.cpp:120 mainwidgetpl.cpp:160
+msgid "CounterD"
+msgstr "ZählerD"
-#: mainwidgetpl.cpp:123
-msgid "\tmovwf \tCounterC\n"
-msgstr "\tmovwf \tZählerC\n"
+#: mainwidgetpl.cpp:126 mainwidgetpl.cpp:155
+msgid "CounterC"
+msgstr "ZählerC"
-#: mainwidgetpl.cpp:127
-msgid "\tmovwf \tCounterB\n"
-msgstr "\tmovwf \tZählerB\n"
+#: mainwidgetpl.cpp:132 mainwidgetpl.cpp:150
+msgid "CounterB"
+msgstr "ZählerB"
-#: mainwidgetpl.cpp:131
-msgid ""
-"\tmovwf \tCounterA\n"
-"\n"
-msgstr ""
-"\tmovwf \tZählerA\n"
-"\n"
+#: mainwidgetpl.cpp:139 mainwidgetpl.cpp:144
+msgid "CounterA"
+msgstr "ZählerA"
-#: mainwidgetpl.cpp:134
-msgid ""
-"\tdecfsz \tCounterA,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tZählerA,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:137
-msgid ""
-"\tdecfsz \tCounterB,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tZählerB,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:140
-msgid ""
-"\tdecfsz \tCounterC,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tZählerC,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:143
-msgid ""
-"\tdecfsz \tCounterD,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tZählerD,1\n"
-"\tgoto \t%1\n"
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2007-10-11 15:07:42 UTC (rev 143)
+++ prog/trunk/po/es.po 2007-10-11 15:29:50 UTC (rev 144)
@@ -1,19 +1,21 @@
-# translation of es.po to Spanish
+# translation of es.po to Français
# Copyright (C) 2007 Free Software Foundation, Inc.
#
# Carlos M. Cámara Mora <cmc...@gm...>, 2007.
+# Alain PORTAL <ap...@un...>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-24 10:12+0200\n"
-"PO-Revision-Date: 2007-09-29 18:28+0200\n"
-"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
-"Language-Team: Spanish <tra...@es...>\n"
+"POT-Creation-Date: 2007-10-11 17:22+0200\n"
+"PO-Revision-Date: 2007-10-11 17:26+0200\n"
+"Last-Translator: Alain PORTAL <ap...@un...>\n"
+"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: \n"
+"X-Generator: KBabel 1.11.4\n"
#. i18n: file pikloopsui.rc line 4
#: rc.cpp:3
@@ -73,21 +75,21 @@
msgid "Frequency (MHz)"
msgstr "Frecuencia (MHz)"
-#: mainwidgetpl.cpp:61
+#: mainwidgetpl.cpp:62
msgid "Select a standard device clock, or type a custom clock frequency."
msgstr ""
"Seleccione un dispositivo de reloj estándar, o introduzca una frecuencia de "
"reloj arbitraria."
-#: mainwidgetpl.cpp:64
+#: mainwidgetpl.cpp:65
msgid "Needed delay (s)"
msgstr "Retraso (s) necesario (s)"
-#: mainwidgetpl.cpp:70
+#: mainwidgetpl.cpp:71
msgid "Ouput data"
msgstr "Datos de salida"
-#: mainwidgetpl.cpp:72
+#: mainwidgetpl.cpp:73
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr "Copie y pegue este código, o simplemente arrástrelo hasta su editor."
@@ -119,54 +121,19 @@
"; Tiempo de retardo = %1 con Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:119
-msgid "\tmovwf \tCounterD\n"
-msgstr "\tmovwf \tContadorD\n"
+#: mainwidgetpl.cpp:120 mainwidgetpl.cpp:160
+msgid "CounterD"
+msgstr "ContadorD"
-#: mainwidgetpl.cpp:123
-msgid "\tmovwf \tCounterC\n"
-msgstr "\tmovwf \tContadorC\n"
+#: mainwidgetpl.cpp:126 mainwidgetpl.cpp:155
+msgid "CounterC"
+msgstr "ContadorC"
-#: mainwidgetpl.cpp:127
-msgid "\tmovwf \tCounterB\n"
-msgstr "\tmovwf \tContadorB\n"
+#: mainwidgetpl.cpp:132 mainwidgetpl.cpp:150
+msgid "CounterB"
+msgstr "ContadorB"
-#: mainwidgetpl.cpp:131
-msgid ""
-"\tmovwf \tCounterA\n"
-"\n"
-msgstr ""
-"\tmovwf \tContadorA\n"
-"\n"
+#: mainwidgetpl.cpp:139 mainwidgetpl.cpp:144
+msgid "CounterA"
+msgstr "ContadorA"
-#: mainwidgetpl.cpp:134
-msgid ""
-"\tdecfsz \tCounterA,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tContadorA,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:137
-msgid ""
-"\tdecfsz \tCounterB,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tContadorB,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:140
-msgid ""
-"\tdecfsz \tCounterC,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tContadorC,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:143
-msgid ""
-"\tdecfsz \tCounterD,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tContadorD,1\n"
-"\tgoto \t%1\n"
Modified: prog/trunk/po/fr.po
===================================================================
--- prog/trunk/po/fr.po 2007-10-11 15:07:42 UTC (rev 143)
+++ prog/trunk/po/fr.po 2007-10-11 15:29:50 UTC (rev 144)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-24 10:12+0200\n"
-"PO-Revision-Date: 2007-05-24 10:13+0200\n"
+"POT-Creation-Date: 2007-10-11 17:22+0200\n"
+"PO-Revision-Date: 2007-10-11 17:25+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -73,21 +73,21 @@
msgid "Frequency (MHz)"
msgstr "Fréquence (MHz)"
-#: mainwidgetpl.cpp:61
+#: mainwidgetpl.cpp:62
msgid "Select a standard device clock, or type a custom clock frequency."
msgstr ""
"Choisissez une horloge standard ou bien entrez une valeur de fréquence "
"d'horloge personnalisée."
-#: mainwidgetpl.cpp:64
+#: mainwidgetpl.cpp:65
msgid "Needed delay (s)"
msgstr "Temporisation souhaitée (s)"
-#: mainwidgetpl.cpp:70
+#: mainwidgetpl.cpp:71
msgid "Ouput data"
msgstr "Données de sortie"
-#: mainwidgetpl.cpp:72
+#: mainwidgetpl.cpp:73
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
"Copiez et collez ce code ou bien effectuez un glissé/déposé dans votre "
@@ -121,54 +121,19 @@
"; Durée temporisation = %1s avec Osc = %2MHz\n"
"\n"
-#: mainwidgetpl.cpp:119
-msgid "\tmovwf \tCounterD\n"
-msgstr "\tmovwf \tCompteur_D\n"
+#: mainwidgetpl.cpp:120 mainwidgetpl.cpp:160
+msgid "CounterD"
+msgstr "Compteur_D"
-#: mainwidgetpl.cpp:123
-msgid "\tmovwf \tCounterC\n"
-msgstr "\tmovwf \tCompteur_C\n"
+#: mainwidgetpl.cpp:126 mainwidgetpl.cpp:155
+msgid "CounterC"
+msgstr "Compteur_C"
-#: mainwidgetpl.cpp:127
-msgid "\tmovwf \tCounterB\n"
-msgstr "\tmovwf \tCompteur_B\n"
+#: mainwidgetpl.cpp:132 mainwidgetpl.cpp:150
+msgid "CounterB"
+msgstr "Compteur_B"
-#: mainwidgetpl.cpp:131
-msgid ""
-"\tmovwf \tCounterA\n"
-"\n"
-msgstr ""
-"\tmovwf \tCompteur_A\n"
-"\n"
+#: mainwidgetpl.cpp:139 mainwidgetpl.cpp:144
+msgid "CounterA"
+msgstr "Compteur_A"
-#: mainwidgetpl.cpp:134
-msgid ""
-"\tdecfsz \tCounterA,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tCompteur_A,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:137
-msgid ""
-"\tdecfsz \tCounterB,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tCompteur_B,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:140
-msgid ""
-"\tdecfsz \tCounterC,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tCompteur_C,1\n"
-"\tgoto \t%1\n"
-
-#: mainwidgetpl.cpp:143
-msgid ""
-"\tdecfsz \tCounterD,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-"\tdecfsz \tCompteur_D,1\n"
-"\tgoto \t%1\n"
Modified: prog/trunk/po/pikloops.pot
===================================================================
--- prog/trunk/po/pikloops.pot 2007-10-11 15:07:42 UTC (rev 143)
+++ prog/trunk/po/pikloops.pot 2007-10-11 15:29:50 UTC (rev 144)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-24 10:12+0200\n"
+"POT-Creation-Date: 2007-10-11 17:22+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -71,19 +71,19 @@
msgid "Frequency (MHz)"
msgstr ""
-#: mainwidgetpl.cpp:61
+#: mainwidgetpl.cpp:62
msgid "Select a standard device clock, or type a custom clock frequency."
msgstr ""
-#: mainwidgetpl.cpp:64
+#: mainwidgetpl.cpp:65
msgid "Needed delay (s)"
msgstr ""
-#: mainwidgetpl.cpp:70
+#: mainwidgetpl.cpp:71
msgid "Ouput data"
msgstr ""
-#: mainwidgetpl.cpp:72
+#: mainwidgetpl.cpp:73
msgid "Copy and paste this code, or simply drag and drop it to your editor."
msgstr ""
@@ -113,44 +113,18 @@
"\n"
msgstr ""
-#: mainwidgetpl.cpp:119
-msgid "\tmovwf \tCounterD\n"
+#: mainwidgetpl.cpp:120 mainwidgetpl.cpp:160
+msgid "CounterD"
msgstr ""
-#: mainwidgetpl.cpp:123
-msgid "\tmovwf \tCounterC\n"
+#: mainwidgetpl.cpp:126 mainwidgetpl.cpp:155
+msgid "CounterC"
msgstr ""
-#: mainwidgetpl.cpp:127
-msgid "\tmovwf \tCounterB\n"
+#: mainwidgetpl.cpp:132 mainwidgetpl.cpp:150
+msgid "CounterB"
msgstr ""
-#: mainwidgetpl.cpp:131
-msgid ""
-"\tmovwf \tCounterA\n"
-"\n"
+#: mainwidgetpl.cpp:139 mainwidgetpl.cpp:144
+msgid "CounterA"
msgstr ""
-
-#: mainwidgetpl.cpp:134
-msgid ""
-"\tdecfsz \tCounterA,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-
-#: mainwidgetpl.cpp:137
-msgid ""
-"\tdecfsz \tCounterB,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-
-#: mainwidgetpl.cpp:140
-msgid ""
-"\tdecfsz \tCounterC,1\n"
-"\tgoto \t%1\n"
-msgstr ""
-
-#: mainwidgetpl.cpp:143
-msgid ""
-"\tdecfsz \tCounterD,1\n"
-"\tgoto \t%1\n"
-msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 15:07:38
|
Revision: 143
http://pikloops.svn.sourceforge.net/pikloops/?rev=143&view=rev
Author: dionysos-sf
Date: 2007-10-11 08:07:42 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Harmonious code
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 15:06:01 UTC (rev 142)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 15:07:42 UTC (rev 143)
@@ -133,15 +133,17 @@
tmpCode += "\n";
}
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ if ( loopValues->getCounterA() !=-1 ) {
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
tmpCode += QString("\tmovwf\t");
tmpCode += QString(i18n("CounterA"));
tmpCode += "\n\n";
- tmpCode += loopName ;
- tmpCode += "\n" ;
+ tmpCode += loopName ;
+ tmpCode += "\n" ;
tmpCode += QString("\tdecfsz\t");
tmpCode += QString(i18n("CounterA"));
tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ }
if ( loopValues->getCounterB() != -1 ) {
tmpCode += QString("\tdecfsz\t");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 15:05:58
|
Revision: 142
http://pikloops.svn.sourceforge.net/pikloops/?rev=142&view=rev
Author: dionysos-sf
Date: 2007-10-11 08:06:01 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Don't localize PIC instructions
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:57:08 UTC (rev 141)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 15:06:01 UTC (rev 142)
@@ -116,31 +116,47 @@
if ( loopValues->getCounterD() != -1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterD(),0,10);
- tmpCode += QString(i18n("\tmovwf\tCounterD\n"));
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterD"));
+ tmpCode += "\n";
}
if ( loopValues->getCounterC() != -1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
- tmpCode += QString(i18n("\tmovwf\tCounterC\n"));
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterC"));
+ tmpCode += "\n";
}
if ( loopValues->getCounterB() !=-1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
- tmpCode += QString(i18n("\tmovwf\tCounterB\n"));
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += "\n";
}
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
- tmpCode += QString(i18n("\tmovwf\tCounterA\n\n"));
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += "\n\n";
tmpCode += loopName ;
tmpCode += "\n" ;
- tmpCode += QString(i18n("\tdecfsz\tCounterA,1\n\tgoto\t%1\n")).arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
if ( loopValues->getCounterB() != -1 ) {
- tmpCode += QString(i18n("\tdecfsz\tCounterB,1\n\tgoto\t%1\n")).arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
}
if ( loopValues->getCounterC() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz\tCounterC,1\n\tgoto\t%1\n")).arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterC"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
}
if ( loopValues->getCounterD() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz\tCounterD,1\n\tgoto\t%1\n")).arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterD"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
}
tmpCode += QString("\treturn\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:57:04
|
Revision: 141
http://pikloops.svn.sourceforge.net/pikloops/?rev=141&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:57:08 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Simplify string
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:56:26 UTC (rev 140)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:57:08 UTC (rev 141)
@@ -143,8 +143,7 @@
tmpCode += QString(i18n("\tdecfsz\tCounterD,1\n\tgoto\t%1\n")).arg(loopName);
}
- tmpCode += QString("\treturn");
- tmpCode += "\n" ;
+ tmpCode += QString("\treturn\n");
// update status line
cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'f',8)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:56:23
|
Revision: 140
http://pikloops.svn.sourceforge.net/pikloops/?rev=140&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:56:26 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Remove useless white space in assembler code line
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:53:40 UTC (rev 139)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:56:26 UTC (rev 140)
@@ -115,32 +115,32 @@
tmpCode += "\n" ;
if ( loopValues->getCounterD() != -1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterD(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterD\n"));
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterD(),0,10);
+ tmpCode += QString(i18n("\tmovwf\tCounterD\n"));
}
if ( loopValues->getCounterC() != -1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterC(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterC\n"));
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
+ tmpCode += QString(i18n("\tmovwf\tCounterC\n"));
}
if ( loopValues->getCounterB() !=-1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterB(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterB\n"));
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
+ tmpCode += QString(i18n("\tmovwf\tCounterB\n"));
}
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterA(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterA\n\n"));
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ tmpCode += QString(i18n("\tmovwf\tCounterA\n\n"));
tmpCode += loopName ;
tmpCode += "\n" ;
- tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz\tCounterA,1\n\tgoto\t%1\n")).arg(loopName);
if ( loopValues->getCounterB() != -1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz\tCounterB,1\n\tgoto\t%1\n")).arg(loopName);
}
if ( loopValues->getCounterC() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz\tCounterC,1\n\tgoto\t%1\n")).arg(loopName);
}
if ( loopValues->getCounterD() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz\tCounterD,1\n\tgoto\t%1\n")).arg(loopName);
}
tmpCode += QString("\treturn");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:53:35
|
Revision: 139
http://pikloops.svn.sourceforge.net/pikloops/?rev=139&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:53:40 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
More cleanup
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:39:48 UTC (rev 138)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:53:40 UTC (rev 139)
@@ -115,16 +115,16 @@
tmpCode += "\n" ;
if ( loopValues->getCounterD() != -1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterD(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterD\n"));
+ tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterD(),0,10);
+ tmpCode += QString(i18n("\tmovwf \tCounterD\n"));
}
if ( loopValues->getCounterC() != -1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterC(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterC\n"));
+ tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterC(),0,10);
+ tmpCode += QString(i18n("\tmovwf \tCounterC\n"));
}
if ( loopValues->getCounterB() !=-1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterB(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterB\n"));
+ tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterB(),0,10);
+ tmpCode += QString(i18n("\tmovwf \tCounterB\n"));
}
tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterA(),0,10);
@@ -134,13 +134,13 @@
tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1\n")).arg(loopName);
if ( loopValues->getCounterB() != -1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
}
if ( loopValues->getCounterC() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
}
if ( loopValues->getCounterD() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
}
tmpCode += QString("\treturn");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:39:45
|
Revision: 138
http://pikloops.svn.sourceforge.net/pikloops/?rev=138&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:39:48 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Default frequency is 4MHz
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:37:31 UTC (rev 137)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:39:48 UTC (rev 138)
@@ -43,7 +43,7 @@
: QVBox(parent, name)
{
QFont LabelFont;
- loopValues = new PiKDelay(20.00, 1.00);
+ loopValues = new PiKDelay(4.00, 1.00);
statusMessage = i18n("Actual delay: %1 s (%2 clock cycles).") ;
setSpacing(3) ;
@@ -58,7 +58,7 @@
"32.000000", "40.000000", 0};
clock->insertStrList( items );
clock->setEditable(true) ;
- clock->setCurrentItem(6) ;
+ clock->setCurrentItem(2) ;
QToolTip::add(clock,i18n("Select a standard device clock, or type a custom clock frequency.")) ;
(new QHBox(grinput))->setMinimumWidth(40) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:37:27
|
Revision: 137
http://pikloops.svn.sourceforge.net/pikloops/?rev=137&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:37:31 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Some cleanup
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:30:14 UTC (rev 136)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:37:31 UTC (rev 137)
@@ -53,8 +53,9 @@
QHGroupBox *grinput = new QHGroupBox(i18n("Input data") , this) ;
new QLabel(i18n("Frequency (MHz)"), grinput) ;
clock = new QComboBox(grinput) ;
- static const char* items[] = { "1.000000", "2.000000", "4.000000","8.000000", "10.000000", "16.000000",
- "20.000000", "24.000000", "32.000000","40.000000",0};
+ static const char* items[] = { "1.000000", "2.000000", "4.000000", "8.000000",
+ "10.000000", "16.000000", "20.000000", "24.000000",
+ "32.000000", "40.000000", 0};
clock->insertStrList( items );
clock->setEditable(true) ;
clock->setCurrentItem(6) ;
@@ -73,7 +74,7 @@
CodeText->setReadOnly(true);
cycles = new QLabel(statusMessage
- .arg(loopValues->getTimeDelay(),0,'f',8)
+ .arg(loopValues->getTimeDelay(),0,'f',8)
.arg((loopValues->getMachineCycles()),0,'f',0) , groutput ) ;
connect(clock, SIGNAL(activated(const QString &)), this, SLOT(ClockChanged(const QString &)));
@@ -96,7 +97,6 @@
*/
void MainWidgetPL::refreshWidget()
{
-
// set label names
QString routineName = i18n("delay_") ;
routineName += delay->text() ;
@@ -114,15 +114,15 @@
tmpCode += routineName ;
tmpCode += "\n" ;
- if (loopValues->getCounterD()!=-1) {
+ if ( loopValues->getCounterD() != -1 ) {
tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterD(),0,10);
tmpCode += QString(i18n("\tmovwf \tCounterD\n"));
}
- if (loopValues->getCounterC()!=-1) {
+ if ( loopValues->getCounterC() != -1 ) {
tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterC(),0,10);
tmpCode += QString(i18n("\tmovwf \tCounterC\n"));
}
- if (loopValues->getCounterB()!=-1) {
+ if ( loopValues->getCounterB() !=-1 ) {
tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterB(),0,10);
tmpCode += QString(i18n("\tmovwf \tCounterB\n"));
}
@@ -133,17 +133,18 @@
tmpCode += "\n" ;
tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1\n")).arg(loopName);
- if (loopValues->getCounterB()!=-1) {
+ if ( loopValues->getCounterB() != -1 ) {
tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
}
- if (loopValues->getCounterC()!=-1) {
+ if ( loopValues->getCounterC() !=-1 ) {
tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
}
- if (loopValues->getCounterD()!=-1) {
+ if ( loopValues->getCounterD() !=-1 ) {
tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
}
tmpCode += QString("\treturn");
+ tmpCode += "\n" ;
// update status line
cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'f',8)
@@ -160,9 +161,7 @@
void MainWidgetPL::setValues()
{
loopValues->setClockFrequency(clock->currentText().toDouble());
-
loopValues->setTimeDelay(delay->text().toDouble());
-
loopValues->Refresh();
refreshWidget();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:30:13
|
Revision: 136
http://pikloops.svn.sourceforge.net/pikloops/?rev=136&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:30:14 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Remove useless function call
Modified Paths:
--------------
prog/trunk/src/pikdelay.cpp
Modified: prog/trunk/src/pikdelay.cpp
===================================================================
--- prog/trunk/src/pikdelay.cpp 2007-10-09 17:50:25 UTC (rev 135)
+++ prog/trunk/src/pikdelay.cpp 2007-10-11 14:30:14 UTC (rev 136)
@@ -148,7 +148,6 @@
*/
double PiKDelay::getMachineCycles()
{
- Refresh();
return MachineCycles;
}
@@ -158,7 +157,6 @@
*/
double PiKDelay::getTimeDelay()
{
- Refresh();
return TimeDelay;
}
@@ -168,7 +166,6 @@
*/
double PiKDelay::getClockFrequency()
{
- Refresh();
return ClockFrequency;
}
@@ -178,7 +175,6 @@
*/
int PiKDelay::getCounterA()
{
- Refresh();
return CounterA;
}
@@ -188,7 +184,6 @@
*/
int PiKDelay::getCounterB()
{
- Refresh();
return CounterB;
}
@@ -198,7 +193,6 @@
*/
int PiKDelay::getCounterC()
{
- Refresh();
return CounterC;
}
@@ -208,7 +202,6 @@
*/
int PiKDelay::getCounterD()
{
- Refresh();
return CounterD;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-09 17:50:21
|
Revision: 135
http://pikloops.svn.sourceforge.net/pikloops/?rev=135&view=rev
Author: dionysos-sf
Date: 2007-10-09 10:50:25 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Typo in generated code
Modified Paths:
--------------
prog/trunk/po/de.po
prog/trunk/po/es.po
prog/trunk/po/fr.po
prog/trunk/po/pikloops.pot
Modified: prog/trunk/po/de.po
===================================================================
--- prog/trunk/po/de.po 2007-10-09 17:37:40 UTC (rev 134)
+++ prog/trunk/po/de.po 2007-10-09 17:50:25 UTC (rev 135)
@@ -12,7 +12,7 @@
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. i18n: file pikloopsui.rc line 4
#: rc.cpp:3
@@ -44,16 +44,17 @@
msgid ""
"Author of the original PicLoops for Windows.\n"
"His Calculations Formulas made it possible."
-msgstr "Ursprünglicher PicLoops Autor für Windows.\n "
-"Seine Berechnungsformulare haben es möglich gemacht"
+msgstr ""
+"Ursprünglicher PicLoops Autor für Windows.\n"
+" Seine Berechnungsformulare haben es möglich gemacht"
-#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
+#: _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Lukas Brausch"
-#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
+#: _translatorinfo.cpp:3
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -85,7 +86,9 @@
#: mainwidgetpl.cpp:72
msgid "Copy and paste this code, or simply drag and drop it to your editor."
-msgstr "Kopiere diesen Code oder füge ihn durch \"drag and drop\" in deinen Editor ein"
+msgstr ""
+"Kopiere diesen Code oder füge ihn durch \"drag and drop\" in deinen Editor "
+"ein"
#: mainwidgetpl.cpp:101
msgid "delay_"
@@ -111,7 +114,8 @@
msgid ""
"; Time Delay = %1s with Osc = %2MHz\n"
"\n"
-msgstr "; Zeitverzögerung = %1s mit Osc = %2MHz\n"
+msgstr ""
+"; Zeitverzögerung = %1s mit Osc = %2MHz\n"
"\n"
#: mainwidgetpl.cpp:119
@@ -137,32 +141,31 @@
#: mainwidgetpl.cpp:134
msgid ""
"\tdecfsz \tCounterA,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tZählerA,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:137
msgid ""
"\tdecfsz \tCounterB,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tZählerB,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:140
msgid ""
"\tdecfsz \tCounterC,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tZählerC,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:143
msgid ""
"\tdecfsz \tCounterD,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tZählerD,1\n"
-"\tgoto \t%1 \n"
-
+"\tgoto \t%1\n"
Modified: prog/trunk/po/es.po
===================================================================
--- prog/trunk/po/es.po 2007-10-09 17:37:40 UTC (rev 134)
+++ prog/trunk/po/es.po 2007-10-09 17:50:25 UTC (rev 135)
@@ -6,14 +6,14 @@
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-20 01:11+0200\n"
+"POT-Creation-Date: 2007-05-24 10:12+0200\n"
"PO-Revision-Date: 2007-09-29 18:28+0200\n"
"Last-Translator: Carlos M. Cámara Mora <cmc...@gm...>\n"
"Language-Team: Spanish <tra...@es...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: "
+"Plural-Forms: \n"
#. i18n: file pikloopsui.rc line 4
#: rc.cpp:3
@@ -53,15 +53,13 @@
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr ""
-"Carlos M. Cámara Mora"
+msgstr "Carlos M. Cámara Mora"
#: _translatorinfo.cpp:3
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr ""
-"cmcamara+PIKLOOPS AT gmail DOT com"
+msgstr "cmcamara+PIKLOOPS AT gmail DOT com"
#: mainwidgetpl.cpp:47
msgid "Actual delay: %1 s (%2 clock cycles)."
@@ -77,7 +75,9 @@
#: mainwidgetpl.cpp:61
msgid "Select a standard device clock, or type a custom clock frequency."
-msgstr "Seleccione un dispositivo de reloj estándar, o introduzca una frecuencia de reloj arbitraria."
+msgstr ""
+"Seleccione un dispositivo de reloj estándar, o introduzca una frecuencia de "
+"reloj arbitraria."
#: mainwidgetpl.cpp:64
msgid "Needed delay (s)"
@@ -142,32 +142,31 @@
#: mainwidgetpl.cpp:134
msgid ""
"\tdecfsz \tCounterA,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tContadorA,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:137
msgid ""
"\tdecfsz \tCounterB,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tContadorB,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:140
msgid ""
"\tdecfsz \tCounterC,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tContadorC,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:143
msgid ""
"\tdecfsz \tCounterD,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tContadorD,1\n"
-"\tgoto \t%1 \n"
-
+"\tgoto \t%1\n"
Modified: prog/trunk/po/fr.po
===================================================================
--- prog/trunk/po/fr.po 2007-10-09 17:37:40 UTC (rev 134)
+++ prog/trunk/po/fr.po 2007-10-09 17:50:25 UTC (rev 135)
@@ -144,32 +144,31 @@
#: mainwidgetpl.cpp:134
msgid ""
"\tdecfsz \tCounterA,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tCompteur_A,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:137
msgid ""
"\tdecfsz \tCounterB,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tCompteur_B,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:140
msgid ""
"\tdecfsz \tCounterC,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tCompteur_C,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
#: mainwidgetpl.cpp:143
msgid ""
"\tdecfsz \tCounterD,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
"\tdecfsz \tCompteur_D,1\n"
-"\tgoto \t%1 \n"
-
+"\tgoto \t%1\n"
Modified: prog/trunk/po/pikloops.pot
===================================================================
--- prog/trunk/po/pikloops.pot 2007-10-09 17:37:40 UTC (rev 134)
+++ prog/trunk/po/pikloops.pot 2007-10-09 17:50:25 UTC (rev 135)
@@ -134,23 +134,23 @@
#: mainwidgetpl.cpp:134
msgid ""
"\tdecfsz \tCounterA,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
#: mainwidgetpl.cpp:137
msgid ""
"\tdecfsz \tCounterB,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
#: mainwidgetpl.cpp:140
msgid ""
"\tdecfsz \tCounterC,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
#: mainwidgetpl.cpp:143
msgid ""
"\tdecfsz \tCounterD,1\n"
-"\tgoto \t%1 \n"
+"\tgoto \t%1\n"
msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-09 17:37:38
|
Revision: 134
http://pikloops.svn.sourceforge.net/pikloops/?rev=134&view=rev
Author: dionysos-sf
Date: 2007-10-09 10:37:40 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Typo in generated code
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-09 17:31:15 UTC (rev 133)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-09 17:37:40 UTC (rev 134)
@@ -131,16 +131,16 @@
tmpCode += QString(i18n("\tmovwf \tCounterA\n\n"));
tmpCode += loopName ;
tmpCode += "\n" ;
- tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1 \n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1\n")).arg(loopName);
if (loopValues->getCounterB()!=-1) {
- tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1 \n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
}
if (loopValues->getCounterC()!=-1) {
- tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1 \n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
}
if (loopValues->getCounterD()!=-1) {
- tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1 \n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
}
tmpCode += QString("\treturn");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-09 17:31:13
|
Revision: 133
http://pikloops.svn.sourceforge.net/pikloops/?rev=133&view=rev
Author: dionysos-sf
Date: 2007-10-09 10:31:15 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Fix compile time error
Modified Paths:
--------------
prog/trunk/src/pikdelay.cpp
Modified: prog/trunk/src/pikdelay.cpp
===================================================================
--- prog/trunk/src/pikdelay.cpp 2007-10-09 17:22:39 UTC (rev 132)
+++ prog/trunk/src/pikdelay.cpp 2007-10-09 17:31:15 UTC (rev 133)
@@ -51,6 +51,7 @@
if ( CounterA == 256 ) {
CounterA = 0;
+ }
}
if ( MachineCycles > 766.0 && MachineCycles <= 196350.0 ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-09 17:22:50
|
Revision: 132
http://pikloops.svn.sourceforge.net/pikloops/?rev=132&view=rev
Author: dionysos-sf
Date: 2007-10-09 10:22:39 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Mispelling
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
prog/trunk/src/pikdelay.cpp
prog/trunk/src/pikdelay.h
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-09 17:15:19 UTC (rev 131)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-09 17:22:39 UTC (rev 132)
@@ -109,7 +109,7 @@
tmpCode += ")\n" ;
tmpCode += QString(i18n("; Time Delay = %1s with Osc = %2MHz\n\n")).
- arg(loopValues->getTimeDelay(),0,'f',8).arg(loopValues->getClockFrecuency(),0,'f',8);
+ arg(loopValues->getTimeDelay(),0,'f',8).arg(loopValues->getClockFrequency(),0,'f',8);
tmpCode += routineName ;
tmpCode += "\n" ;
Modified: prog/trunk/src/pikdelay.cpp
===================================================================
--- prog/trunk/src/pikdelay.cpp 2007-10-09 17:15:19 UTC (rev 131)
+++ prog/trunk/src/pikdelay.cpp 2007-10-09 17:22:39 UTC (rev 132)
@@ -42,7 +42,7 @@
void PiKDelay::Refresh()
{
CounterA = CounterB = CounterC = CounterD = -1;
- MachineCycleTime = 4.0/(ClockFrecuency*1000000.0);
+ MachineCycleTime = 4.0/(ClockFrequency*1000000.0);
MachineCycles = floor(TimeDelay/MachineCycleTime);
if ( MachineCycles <= 766.0 ) {
@@ -115,15 +115,15 @@
/*!
- \fn PiKDelay::setClockFrecuency(double)
+ \fn PiKDelay::setClockFrequency(double)
*/
void PiKDelay::setClockFrequency(double CF)
{
if ( CF > 0 ) {
- ClockFrecuency = CF;
+ ClockFrequency = CF;
}
else {
- ClockFrecuency = 4.00;
+ ClockFrequency = 4.00;
}
}
@@ -163,12 +163,12 @@
/*!
- \fn PiKDelay::getClockFrecuency()
+ \fn PiKDelay::getClockFrequency()
*/
-double PiKDelay::getClockFrecuency()
+double PiKDelay::getClockFrequency()
{
Refresh();
- return ClockFrecuency;
+ return ClockFrequency;
}
Modified: prog/trunk/src/pikdelay.h
===================================================================
--- prog/trunk/src/pikdelay.h 2007-10-09 17:15:19 UTC (rev 131)
+++ prog/trunk/src/pikdelay.h 2007-10-09 17:22:39 UTC (rev 132)
@@ -36,7 +36,7 @@
void setTimeDelay(double);
double getMachineCycles();
double getTimeDelay();
- double getClockFrecuency();
+ double getClockFrequency();
int getCounterA();
int getCounterB();
int getCounterC();
@@ -44,7 +44,7 @@
void Refresh();
private:
- double ClockFrecuency;
+ double ClockFrequency;
double TimeDelay;
double MachineCycles;
int CounterA;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-09 17:15:21
|
Revision: 131
http://pikloops.svn.sourceforge.net/pikloops/?rev=131&view=rev
Author: dionysos-sf
Date: 2007-10-09 10:15:19 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Fix a gpasm warning
Modified Paths:
--------------
prog/trunk/src/pikdelay.cpp
Modified: prog/trunk/src/pikdelay.cpp
===================================================================
--- prog/trunk/src/pikdelay.cpp 2007-10-09 17:12:23 UTC (rev 130)
+++ prog/trunk/src/pikdelay.cpp 2007-10-09 17:15:19 UTC (rev 131)
@@ -48,12 +48,22 @@
if ( MachineCycles <= 766.0 ) {
CounterA = static_cast<int> ((MachineCycles-1.0)/3.0);
MachineCycles = 1 + (3*CounterA);
+
+ if ( CounterA == 256 ) {
+ CounterA = 0;
}
if ( MachineCycles > 766.0 && MachineCycles <= 196350.0 ) {
CounterB = static_cast<int>((MachineCycles + 765.0)/770.0);
CounterA = static_cast<int>((MachineCycles + 765.0 - (770.0 * CounterB))/3.0);
MachineCycles = (3.0 * CounterA) + (770.0 * CounterB) - 765.0;
+
+ if ( CounterA == 256 ) {
+ CounterA = 0;
+ }
+ if ( CounterB == 256 ) {
+ CounterB = 0;
+ }
}
if ( MachineCycles > 196350.0 && MachineCycles <= 50070524.0 ) {
@@ -61,6 +71,16 @@
CounterB = static_cast<int>((MachineCycles + 197116.0 - (196355.0 * CounterC))/770.0);
CounterA = static_cast<int>((MachineCycles + 197116.0 - (196355.0 * CounterC) - (770.0 * CounterB))/3.0);
MachineCycles = (3.0 * CounterA) + (770.0 * CounterB) + (196355.0 * CounterC) - 197116.0;
+
+ if ( CounterA == 256 ) {
+ CounterA = 0;
+ }
+ if ( CounterB == 256 ) {
+ CounterB = 0;
+ }
+ if ( CounterC == 256 ) {
+ CounterC = 0;
+ }
}
if ( MachineCycles > 50070524.0 && MachineCycles <= 12767985148.0 ) {
@@ -70,6 +90,19 @@
CounterA = static_cast<int>((MachineCycles + 50267642.0 - (50070530.0 * CounterD) - (196355.0 * CounterC) - (CounterB * 770.0))/3.0);
MachineCycles = (3.0 * CounterA) + (770.0 * CounterB) + (196355.0 * CounterC) + (50070530.0 * CounterD) - 50267642.0;
+
+ if ( CounterA == 256 ) {
+ CounterA = 0;
+ }
+ if ( CounterB == 256 ) {
+ CounterB = 0;
+ }
+ if ( CounterC == 256 ) {
+ CounterC = 0;
+ }
+ if ( CounterD == 256 ) {
+ CounterD = 0;
+ }
}
/*Waitting for correction*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-09 17:12:22
|
Revision: 130
http://pikloops.svn.sourceforge.net/pikloops/?rev=130&view=rev
Author: dionysos-sf
Date: 2007-10-09 10:12:23 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Nicer look
Modified Paths:
--------------
prog/trunk/src/pikdelay.cpp
Modified: prog/trunk/src/pikdelay.cpp
===================================================================
--- prog/trunk/src/pikdelay.cpp 2007-10-08 13:24:46 UTC (rev 129)
+++ prog/trunk/src/pikdelay.cpp 2007-10-09 17:12:23 UTC (rev 130)
@@ -45,22 +45,25 @@
MachineCycleTime = 4.0/(ClockFrecuency*1000000.0);
MachineCycles = floor(TimeDelay/MachineCycleTime);
- if(MachineCycles <= 766.0){
+ if ( MachineCycles <= 766.0 ) {
CounterA = static_cast<int> ((MachineCycles-1.0)/3.0);
MachineCycles = 1 + (3*CounterA);
}
- if(MachineCycles > 766.0 && MachineCycles <= 196350.0){
+
+ if ( MachineCycles > 766.0 && MachineCycles <= 196350.0 ) {
CounterB = static_cast<int>((MachineCycles + 765.0)/770.0);
CounterA = static_cast<int>((MachineCycles + 765.0 - (770.0 * CounterB))/3.0);
MachineCycles = (3.0 * CounterA) + (770.0 * CounterB) - 765.0;
}
- if(MachineCycles > 196350.0 && MachineCycles <= 50070524.0){
+
+ if ( MachineCycles > 196350.0 && MachineCycles <= 50070524.0 ) {
CounterC = static_cast<int>((MachineCycles + 197116.0)/196355.0);
CounterB = static_cast<int>((MachineCycles + 197116.0 - (196355.0 * CounterC))/770.0);
CounterA = static_cast<int>((MachineCycles + 197116.0 - (196355.0 * CounterC) - (770.0 * CounterB))/3.0);
MachineCycles = (3.0 * CounterA) + (770.0 * CounterB) + (196355.0 * CounterC) - 197116.0;
}
- if(MachineCycles > 50070524.0 && MachineCycles <= 12767985148.0){
+
+ if ( MachineCycles > 50070524.0 && MachineCycles <= 12767985148.0 ) {
CounterD = static_cast<int>((MachineCycles + 50267642.0)/50070530.0);
CounterC = static_cast<int>((MachineCycles + 50267642.0 - (50070530.0 * CounterD))/196355.0);
CounterB = static_cast<int>((MachineCycles + 50267642.0 - (50070530.0 * CounterD) - (196355.0 * CounterC))/770.0);
@@ -70,7 +73,7 @@
}
/*Waitting for correction*/
- if(MachineCycles > 12767985148.0){
+ if ( MachineCycles > 12767985148.0 ) {
}
@@ -83,10 +86,10 @@
*/
void PiKDelay::setClockFrequency(double CF)
{
- if(CF > 0){
+ if ( CF > 0 ) {
ClockFrecuency = CF;
}
- else{
+ else {
ClockFrecuency = 4.00;
}
}
@@ -97,10 +100,10 @@
*/
void PiKDelay::setTimeDelay(double TD)
{
- if(TD >= 0){
+ if (TD >= 0) {
TimeDelay = TD;
}
- else{
+ else {
TimeDelay = 1.00;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-08 13:24:46
|
Revision: 129
http://pikloops.svn.sourceforge.net/pikloops/?rev=129&view=rev
Author: dionysos-sf
Date: 2007-10-08 06:24:46 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Update tools for kdevelop svn
Modified Paths:
--------------
prog/trunk/admin/Doxyfile.am
prog/trunk/admin/acinclude.m4.in
prog/trunk/admin/am_edit
prog/trunk/admin/config.guess
prog/trunk/admin/config.sub
prog/trunk/admin/configure.in.bot.end
prog/trunk/admin/cvs.sh
prog/trunk/admin/detect-autoconf.pl
prog/trunk/admin/doxygen.sh
prog/trunk/admin/install-sh
prog/trunk/admin/libtool.m4.in
prog/trunk/admin/ltmain.sh
prog/trunk/admin/missing
Removed Paths:
-------------
prog/trunk/admin/ChangeLog
Deleted: prog/trunk/admin/ChangeLog
===================================================================
--- prog/trunk/admin/ChangeLog 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/ChangeLog 2007-10-08 13:24:46 UTC (rev 129)
@@ -1,761 +0,0 @@
-2002-10-03 Stephan Kulow <co...@kd...>
-
- * made config.h.bot obsolete
-
-2002-04-26 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in removed bogus message
-
-2001-11-07 Walter Tasin <ta...@kd...>
-
- * now #MIN_CONFIG tag takes parameters for KDE_USE_QT, too.
- e.g. #MIN_CONFIG(2.2) for qt 2.2 usage
-
-2000-11-30 David Faure <fa...@kd...>
-
- * acinclude.m4.in: Added kde_moduledir which points to $prefix/lib/kde2/
-
-2000-07-24 Alex Zepeda <jaz...@pa...>
-
- * acinclude.m4.in: Remove the test for malloc.h
-
-2000-04-05 Michael Matz <ma...@if...>
-
- * config.pl : added kludge for compiling regexp's even if
- perl < 5.005 is installed
- * conf.change.pl : added support for autoconf 2.14.1
-
-2000-03-27 David Faure <fa...@kd...>
-
- * acinclude.m4.in, Makefile.common: changed inst-apps semantics
- If present, only the subdirs it lists will be configured and compiled.
- If absent, then subdirs is used (and inst-apps isn't generated anymore)
-
-2000-03-22 David Faure <fa...@kd...>
-
- * am_edit: Added support for KDE_ICON = AUTO
-
-2000-03-18 David Faure <fa...@kd...>
-
- * Makefile.common: Rewrote the list-of-Makefiles generation to make it
- simpler and nicer, using create_makefiles' way of doing it.
- Added support for COMPILE_LAST and COMPILE_FIRST in toplevel Makefile.am
-
-2000-01-05 David Faure <fa...@kd...>
-
- * Makefile.common: hacked around autoconf bug (setting INSTALL to ".."
- when calling a subconfigure and INSTALL is already set).
-
-1999-12-15 Waldo Bastian <ba...@kd...>
-
- * acinclude.m4.in: Test whether Qt compiles AND LINKS without flags.
-
-1999-06-24 Stephan Kulow <co...@kd...>
-
- * am_edit: generate correct Makefile entries for kde-i18n toplevel directories
- * am_edit:
-
-1999-06-14 Stephan Kulow <co...@kd...>
-
- * am_edit: remove idl generated files on make clean
-
-1999-06-09 Stephan Kulow <co...@kd...>
-
- * am_edit: skipping programs with variables in sources for final
-
-1999-06-07 Stephan Kulow <co...@kd...>
-
- * am_edit: added support for idl files
-
-1999-06-02 Stephan Kulow <co...@kd...>
-
- * Makefile.common: preserve comments in .pot files to make it
- possible for programmers and translators to comment them
-
-1999-06-02 Simon Hausmann <hau...@kd...>
-
- * acinclude.m4.in: added kde_servicetypesdir
-
-1999-06-02 David Faure <fa...@kd...>
-
- * acinclude.m4.in: removed LIB_KFM and LIB_KDEUTIL aliases
-
-1999-05-28 Simon Hausmann <hau...@kd...>
-
- * acinclude.m4.in: added kde_servicesdir
-
-1999-05-27 Stephan Kulow <co...@kd...>
-
- * am_edit: lots of changes for better support of --enable-final
-
-1999-05-22 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: added support for --with-dmalloc
-
-1999-05-19 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: added support for --enable-final
-
- * am_edit: added support for --enable-final
-
-1999-05-06 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: change the meaning of --disable-debug
-
-1999-05-04 Helge Deller <de...@gm...>
-
- * acinclude.m4.in: the test for the X-includes/directories failed,
- when compile & link work without special directories (as on HP-UX).
-
-1999-04-20 Stephan Kulow <co...@kd...>
-
- * am_edit: adding DESTDIR replacement for rm and uninstall-local
- too. Seems very useless, but makes testing for uninstall easier
-
-1999-04-01 David Faure <fa...@kd...>
-
- * acinclude.m4.in: Added -lkfile to $(LIB_KIO)
-
-1999-03-30 David Faure <fa...@kd...>
-
- * acinclude.m4.in: Added AC_CHECK_KDEMAXPATHLEN, which defines KDEMAXPATHLEN.
-
-1999-03-29 David Faure <fa...@kd...>
-
- * acinclude.m4.in: added LIB_X11 to XPMLIB and GLLIB, because
- on SCO, they need it _after_ themselves.
-
-1999-03-28 David Faure <fa...@kd...>
-
- * acinclude.m4.in: added LIB_KFM to LIB_KAB alias
-
-1999-03-26 David Faure <fa...@kd...>
-
- * acinclude.m4.in: made LIB_KFILE use LIB_KIO instead of LIB_KFM
- added LIB_KFORMULA
-
-1999-03-20 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: check for libXext - for Russel :)
-
-1999-03-16 Stephan Kulow <co...@kd...>
-
- * acinclud3.m4.in: extend the MICO test with a list of possible
- places where to find CORBA.h
-
-1999-03-15 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: move $QTINC and $QTLIB in search path
-
-1999-03-14 Stephan Kulow <co...@kd...>
-
- * am_edit: install-root is obsolute. Use DESTDIR always
-
-1999-03-03 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: fixing a bug, that $QTDIR was taken before --with-qt*
- * acinclude.m4.in: added KDE_USE_QT, that you can choose if to
- use QT 2.0 or KDE 1.0
-
- * Makefile.common: added target package-merge
-
- * am_edit: many fixes to the POFILES handeling of am_edit
-
-1999-03-02 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: first look at libjpeg6b (from kdesupport) then
- for libjpeg
-
- * config.*, libtool.*: update to the latest FSF tools
-
-1999-02-23 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: error when Sparc CC is used. Better use it in
- configure and tell him the story then letting him find it while
- compiling
-
- * acinclude.m4.in: adding KDE_CHECK_EXTRA_LIBS to all possible tests,
- so that --with-extra-includes is used when needed.
-
- * acinclude.m4.in: configure looks for giflib30, so it should say so
-
- * acinclude.m4.in: don't overwrite x include parameters. Patch by
- Ari Lemmke <ari...@re...> (bug report 741)
-
-1999-02-20 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: fixing KDE_CHECK_PATHS for rechecking. In case
- of defaults (kdelibs) configure didn't cache the results
-
-1999-02-18 David Faure <fa...@kd...>
-
- * acinclude.m4.in: added AC_CHECK_S_ISSOCK, to fix #706.
-
-1999-02-17 David Faure <fa...@kd...>
-
- * acinclude.m4.in: added AC_CHECK_RANDOM, just like
- AC_CHECK_USLEEP, to enable the fake if necessary.
-
-1999-02-13 Kurt Granroth <gra...@kd...>
-
- * acinclude.m4.in: look for QT-2.0
-
-1999-02-05 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: in macro KDE_FIND_PATH treat user given dirs
- and $PATH dirs the same. Added seperate test for to find binary
- ($5) to replace findperl
-
-1999-01-28 Stephan Kulow <co...@kd...>
-
- * automoc: added patch by jbb to be a little bit more precise about
- the number of sourcefiles that include the moc file if it's != 1.
- Besides that automoc will fail with exit code, so the Makefile.cvs
- process does stop in case a problem accoured.
-
- * automoc: don't hardcode header suffix, but allow *.h, *.hh and *.H
-
-1999-01-27 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: try qobjcoll.h and qapplication.h before saying
- OK to qt headers. (I could kill SuSE for splitting into qt-dev
- and qt-compat)
-
-1991-01-23 Stephan Kulow <co...@kd...>
-
- * automoc: added fixes by JB <jb...@wr...>
-
-1999-01-21 Stephan Kulow <co...@kd...>
-
- * automoc: added --help and --path (for use in dist-hook)
-
-1999-01-20 Alex Zepeda <gar...@ho...>
-
- * ltconfig: added entries for FreeBSD 4.x
-
-1999-01-19 Stephan Kulow <co...@kd...>
-
- * automoc: added a distclean-metasources target which deletes all
- moc files and let distclean depend on it
-
-1999-01-18 Stephan Kulow <co...@kd...>
-
- * automoc: several fixes (ignore comment lines + join lines
- with \ )
-
- * automoc: support META_INCLUDES in case the header files are
- not in the same dir as the sources.
-
-1999-01-17 Stephan Kulow <co...@kd...>
-
- * automoc: several fixes.
-
-1999-01-16 Stephan Kulow <co...@kd...>
-
- * automoc: added support for included MOC files.
-
- * acinclude.m4.in: use srcdir for the subdirs stuff as well
-
- * automoc: added better command line parsing and some preparation
- for handling "normal" moc files
-
- * acinclude.m4.in: added aliases for libkio and libkdeutil
-
-1999-01-15 Harri Porten <po...@kd...>
-
- * automoc: Carved in stone syntax for Makefile.in:
- {program}_METASOURCES = USE_AUTOMOC [{suffix}]
-
-1999-01-15 Stephan Kulow <co...@kd...>
-
- * Makefile.common: set top_srcdir to .
-
-1999-01-14 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: don't use config.h.bot any longer
-
-1999-01-08 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: added KDE_CHECK_NEWLIBS
-
- * acinclude.m4.in: test for Qt even if both --with-qt-headers and
- --with-qt-libraries are given. They may be wrong.
-
-1999-01-06 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: change the MOC test so it can be used for other
- tools as well
-
-1998-12-28 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: look for QT-1.42 since kpanel needs it
-
-1998-12-27 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: added /usr/lib for libpython test
-
- * acinclude.m4.in: take my email address out of it and added a
- reference to www.kde.org/faq
-
- * acinclude.m4.in: use Qt >= 1.4
-
- * acinclude.m4.in: added KDE_CHECK_NAMESPACES
-
-1998-12-18 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: test for directories to exist before saying yes
- to compilation :)
-
-1998-12-14 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: added CPLUSPLUS for the kimgio test. It's
- only important for shaman right now, but at least there it is :)
-
-1998-12-12 Stephan Kulow <co...@kd...>
-
- * Makefile.cvs: added common Makefile.cvs
-
- * acinclude.m4.in: Tho...@pr... reported a very ugly
- bug in AC_PROG_CXXCPP, so I added my own version
-
- * acinclude.m4.in: added KDE_CREATE_SUBDIRS_LIST to simplify
- most toplevel configures
-
-1998-12-11 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: added call to AC_PROG_CXXCPP. Not really sure why
- it never caused problems
-
- * acinclude.m4.in: moved LIBTIFF alias
-
- * acinclude.m4.in: only test for the existance of libkimgio if the
- user wants to. For 99% of the applications it doesn't matter if
- configure can find libkimgio :)
-
-1998-12-10 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: some changes to the python check to handle $LIBDL
-
-1998-12-09 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: make Alex's tiff test a real one
-
- * acinclude.m4.in: fix the LIB_TIFF alias to really expand
-
-1998-12-08 Alex Zepeda <gar...@ho...>
-
- * acinclude.m4.in: Fix tiff test to use libtiff34 if it exists.
- This is what the FreeBSD port installs to for whatever reason.
-
- * acinclude.m4.in: s/kde/KDE/ (at least in some of the
- descriptions, obviously no variable names were touched.
-
-1998-12-08 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: moved the LIB_QT alias to the Qt check
-
- * acinclude.m4.in: unset KDEDIR before running conftest
-
- * acinclude.m4.in: fixed mean typo
-
- * acinclude.m4.in: added the copyright header for the gettext
- tests, so that people know we're legal ;)
-
- * acinclude.m4.in: set language to C++ before testing QIMGIO
-
-1998-12-07 Alex Zepeda <gar...@ho...>
-
- * acinclude.m4.in: Fix PNG test to use correct ANSI C code, and
- not trip up gcc.
-
-1998-12-07 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: don't hardcode -ldl
-
- * acinclude.m4.in: move the LIB_X11 alias to the X test to make it
- useful for kdesupport as well
-
- * acinclude.m4.in: give the word CHECK_KIMGIO a meaning in really
- checking for it
-
- * acinclude.m4.in: simple fix to prevent kimgio test from compiling
- KDE application in kdelibs
-
-1998-12-05 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: let KDE_CHECK_KIMGIO depend on AC_PATH_KDE,
- otherwise most tests fail. It didn't mean anything to 90% of the
- packages since they test for KDE before kimgio, but for shaman
- it does
-
- * ltconfig: the real fix for the Solaris && gcc problem.
- Thanks Kurt for reporting it and Alexandre for fixing it :)
-
-1998-12-04 Stephan Kulow <co...@kd...>
-
- * libtool.*: update again
-
- * acinclude.m4.in: changed the function to test for libnsl to
- inet_ntoa since UnixWare 7's version did not have gethostbyname,
- but needs libnsl
-
-1998-12-02 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: fixed the MOC test (again) to use the PATH variable
- correctly (with the correct seperator)
-
- * config.guess: update from the soon to be released autoconf-2.13
-
-1998-12-01 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: fixes for the MOC test. Use PATH now when found
-
-1998-11-30 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: extended the MOC test. It checks now for the
- first line of the output of "moc --help" and looks for Qt in it.
-
-1998-11-27 Stephan Kulow <co...@kd...>
-
- * ltconfig: another libtool update. Fixes an ugly bug on Solaris,
- when GNU ld is in path before Solaris ld, but gcc uses the later
-
-1998-11-26 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: made the Qt test more advance to check for qt
- 1.41 - I still need to make it better, but there shouldn't be too
- many qt releases in a row, would there? ;)
-
- * ltconfig: libtool update with better BSD/OS support
-
-1998-11-22 Stephan Kulow <co...@kd...>
-
- * ltconfig: cool - libtool uses g++ now to link libraries on Solaris.
- This means, static objects become usuable on that plattforms (some
- others as well).
-
-1998-11-20 Stephan Kulow <co...@kd...>
-
- * ltmain.sh: updated libtool from their CVS - fixes bugs we haven't
- found and adds some more features, that we do not need ;-)
-
-1998-11-19 David Faure <fa...@kd...>
-
- * acinclude.m4.in: added AC_CHECK_UTMP_FILE, taken from kdebase
-
-1998-11-16 Harri Porten <po...@kd...>
-
- * automoc: take care of "ar" object files, too.
-
-1998-11-16 Stephan Kulow <co...@kd...>
-
- * libtool.m4.in: revised my --silent patch. The solution
- Alexandre suggested is much better.
-
-1998-11-15 Stephan Kulow <co...@kd...>
-
- * ltconfig.in: done some tweakings to support -export-dynamic
- with egcs
-
- * config.sub: wow - BeOS support :)
-
-1998-11-14 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: don't use rpath for test program, if rpath is
- disabled for applications
-
- * ltconfig: patched libtool to make it silent without making
- ltconfig silent
-
- * acinclude.m4.in: make libtool silent again
-
- * libtool.m4.in: update to libtool-981114 (untested stuff, but
- we have to test it to make it tested - sounds that logical? :-)
-
- * libtool.m4.in: moved the self stricked libtool tests to "our"
- file.
-
- * acinclude.m4.in: moved ChangeLog of kdebase which I used to
- maintain acinclude.m4.in logs to kde-common/admin. Hopefully I
- will maintain it more often from now on :)
-
-1998-07-27 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: fixed some things in the MOC test
-
- * acinclude.m4.in: fixed this damn msgfmt test
-
-1998-06-02 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: ignore msgfmt, if not GNU gettext
-
-1998-05-28 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: fixed KDE_CHECK_STL. Checks for HP and SGI type
-
- * acinclude.m4.in: embraced every variable with "" to make
- it consistent
-
- * acinclude.m4.in: various fixes for the koffice checks
- (mico, ministl and python)
-
-1998-05-16 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: don't use KDE_CHECK_QT_DIRECT, when
- --with-qt-libs are given
-
-1998-04-21 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: cool, I found the trick to suppress the ls
- errors
-
-1998-04-20 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: rewrote the qt checking test, since it
- didn't work under FreeBSD, since it relied on the .so link.
- The new version is a little bit buggy, but I need some testing
- to make it perfect
-
- * acinclude.m4.in: fixed the side effects of the PAM test
-
-1998-04-18 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: hopefully fixed the PAM test (I rewrote it)
-
-1998-04-16 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: extended the getsockname test inspired
- by a patch by Martin Baulig
-
- * configure.in: added test for utmp file
-
- * acinclude.m4.in: made --without-pam default
-
-
-1998-04-06 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: don't test compiling, linking, running in
- one step. This proved to be too dangerous for my mail box.
-
-1998-03-21 Stephan Kulow <co...@kd...>
-
- * libtool.m4.in: created some new macros to work around this
- ugly (because long) help of configure --enable-shared/static
-
-1998-03-05 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: set language to C++ before trying the ksize_t
- test
-
- * configure.in: sorted the Makefile entries alphabeticly (and all
- together: we love xemacs! we love xemacs! ;)
-
- * configure.in: added sk
-
- * acinclude.m4.in: substitute x_libraries to fix the empty -rpath
-
-1998-03-03 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: add a rpath for every shared library, that is
- linked too (especially X11 libraries)
-
-Tue Feb 24 22:04:59 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: added kde_sounddir and set kde_minidir to
- kde_icondir/mini to break not too much
-
-Sun Feb 15 18:25:50 1998 Stephan Kulow <co...@kd...>
-
- * configure.in: added bugfix by Bob Miller <kb...@en...>
- (correct reset of IFS)
-
-Wed Feb 11 00:53:11 1998 Stephan Kulow <co...@kd...>
-
- * configure.in: made shadow under Linux default, since the
- binaries will work also under non-shadow systems. The only problem
- left is PAM, so I disabled shadow in case, PAM is present
-
-Tue Feb 10 16:46:32 1998 Stephan Kulow <co...@kd...>
-
- * configure.in: added test for nice to find out, if the option
- -nice works for the screensavers
-
- * acinclude.m4.in: port to LynxOS. For this I moved all library
- search routines in KDE_MISC_TESTS, so I don't need to write this
- in every package
-
- * README: some grammar fixes
-
- * acinclude.m4.in: search for the libs in the exec_prefix, when
- it's present
-
-Sun Feb 8 14:07:23 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: updated all packages
-
- * libtool.m4.in: applied patch for libtool.m4.in to show the
- correct default for shared and static
-
-
-Sat Feb 7 10:56:00 1998 Stephan Kulow <co...@kd...>
-
- * configure.in: good news - KDE is relocatable again.
-
- * libtool.m4.in: updated to latest libtool 1.0i
-
-Fri Feb 6 21:26:51 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: added a AC_PROVIDE for AC_PROG_CC and
- AC_PROG_CPP to KDE_CHECK_COMPILERS
-
-Thu Feb 5 16:27:47 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: put $QTDIR/bin before /usr/bin in the path to
- look for moc. I don't know why, but I got a report, that configure
- found /usr/bin/moc under Solaris
-
-Fri Jan 30 15:47:50 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: export LIBRARY_PATH after reset to the saved
- value
-
- * acinclude.m4.in: unset the LIBRARY_PATH to get a relieable
- result when trying to find, if Qt compiles without -L
-
-Sat Jan 24 00:45:52 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: fixed another bug in AC_PATH_KDE
-
-Thu Jan 22 14:46:15 1998 Stephan Kulow <co...@kd...>
-
- * configure.in: fixed an ugly bug in AC_BASE_PATH_KDE
-
- * kappfinder/kappfinder.in: let kappfinder create by configure to
- allow the use of the kde_ paths
-
-Wed Jan 21 22:19:35 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in: - added a install_root prefix to all paths, if
- set, to enable package managers to move the whole installation at once
- - added --with-install-root to set the install_root prefix
-
-Tue Jan 20 22:41:04 1998 Stephan Kulow <co...@kd...>
-
- * configure.in: added NOOPT_CXXFLAGS to allow kioslave to be
- compiled without -O2
-
-Mon Jan 19 21:55:21 1998 Stephan Kulow <co...@kd...>
-
- * configure.in: some little fixes for the Makefiles
-
- * acinclude.m4.in: --prefix will no longer override the search for
- libraries. If they are present somewhere, they are used (through
- the methodes in KApplication)
-
-Mon Jan 12 00:30:36 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in fixed an ugly bug, that accoured, when
- qt_libraries is not set (empty/equals X11/not necessary)
-
- * acinclude.m4.in moved the remove of the files after the error
- detection
-
-
-Sun Jan 11 17:27:53 1998 Stephan Kulow <co...@kd...>
-
- * acinclude.m4.in added a new macro KDE_CHECK_QT_DIRECT to unset
- the Qt library path, if a Qt program compiles without them
-
- * acinclude.m4.in added a return value in the CREATE_KFSSTND
- macro. Perhaps this has caused the problems
-
-Sat Jan 10 17:40:44 1998 Stephan Kulow <co...@kd...>
-
- * ChangeLog started to maintain a ChangeLog file again
- * acinclude.m4.in the AC_CREATE_KFSSTND to get better debug output
- to find the problem
-
-
-Old logs, Stephan Kulow made:
-
-0.1 : first steps with libkde
-0.2 : first release with libkde, khtmlw, kdehelp, acli, kwm, kpanel
-0.3 : added kfm and bugfixes
-0.4 : updated khtmlw, kdehelp, kwm, changed install in all subdirs
-0.5 : support libtool (chooseable shared libs)
-0.6 : split libkde in kdecore and kdeui
-0.6.1 : Bugfixes
-0.7 : added code from Janos Farkas (configure)
- : added @{kde,qt}_{includes,libraries}@
-0.7.1: Bugfixes
-0.7.2: Bugfixes
-0.7.3: added @all_includes@ and @all_libraries@
- replaced all incompatible flags like $(CC) and -DHAVE_UNISTD_H
-0.7.4: changed support for libkde (back in it's own)
- added kpat
- updated kpanel, kwm, kghostview
-0.8: removed a bug in kghostview
- lifted installation process of several apps
- splitt kdebase into kdelibs and kdeapps
- updated khtmlw, kfm and kdehelp
- added kcalc and kpaint
- updated kdisplay
- added kscreensaver
- added --enable-kscreensaver
- added --enable-debug (and @CXXFLAGS@ to all Makefile.ins)
- updated kwm to 0.4.7
- added make uninstall to every app
- added kvt
- added khexdit
- added .kdelnk for kmines, kedit, ktetris
- put kwm, kfind's .kdelnk in the right directories
- replaced --enable-kscreensaver by --disable-kscreensaver
- updated kpanel to 0.15
- some bugfixes (thanks Marco)
- some bugfixes (thanks Martin)
- changed acinclude.m4, because aclocal won't
- updated kwm to 0.4.8 (patched it again for Qt-1.2)
- updated kvt to 0.13 (patch from Matthias)
- patched kvt and kwm
- updated kwm to 0.5.0
- updated kvt for 0.14 (again and again :-)
- updated kview to 0.10
- updated kfm to 0.6.3
- patched kscreensaver for FreeBSD (thanks Marc)
-0.9: updated kdisplay to 0.5.3
- added klogout
- patches from Matthias
- updated kfm to 0.6.4
- updated kghostview to 0.4
- added QTINC and QTLIB
- updated kdehelp to 0.4.11
- patched kfm to support ktoolbar
- updated kedit to kedit+
- added kfontmanager 0.2.1
-0.9.1: changed kpaint's make style
- bugfixing
- updated kmines to 0.6.5
- updated ktetris to 0.2.4
- changed to Makefiles to depend on Makefile.in
- changed the Makefiles to let install depend on all
- added kjots-0.2.2
- updated kjots-0.2.3
- updated kfm to 0.6.6
- updated kjots-0.2.4
- updated kpaint-0.2
- updated kedit to 0.5
- updated kfontmanager to 0.2.2
- updated kfm to 0.6.7
- updated ktetris to 0.2.5
- updated kjots to 0.2.5
-0.10: added HAVE_SQRTL
- added HAVE_CRYPT_H
- updated kfind
- updated kfm to kfm-0.8.1
- re-introduced automake to kdebase
- bugfixes for the configure.in
- added XPM, GL and PAM tests to configure
- added morph3d to kscreensavers
- updated kfind to 0.3.2
- added some patches for SGI
-... lost the time to maintain a Changelog ;)
Modified: prog/trunk/admin/Doxyfile.am
===================================================================
--- prog/trunk/admin/Doxyfile.am 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/Doxyfile.am 2007-10-08 13:24:46 UTC (rev 129)
@@ -73,11 +73,11 @@
@if test "$(subdir)" != "."; then \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
- fi\
- else\
+ fi \
+ else \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
- fi\
+ fi \
fi
install-apidox-recurse: install-apidox
Modified: prog/trunk/admin/acinclude.m4.in
===================================================================
--- prog/trunk/admin/acinclude.m4.in 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/acinclude.m4.in 2007-10-08 13:24:46 UTC (rev 129)
@@ -428,17 +428,8 @@
if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
- if test -f /etc/debian_version; then
- if dpkg -s kdelibs4 | grep Status | grep not-installed 2>&1 >/dev/null; then
- kde_htmldir='\${prefix}/share/doc/HTML';
- else
- kde_htmldir='\${prefix}/share/doc/kde/HTML'
- fi
- else
- kde_htmldir='\${prefix}/share/doc/HTML'
- fi
+ kde_htmldir='\${datadir}/doc/HTML'
fi
-
if test -z "$kde_appsdir"; then
kde_appsdir='\${datadir}/applnk'
fi
@@ -793,7 +784,7 @@
# CoreAudio framework
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
- FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
+ FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
])
AC_CHECK_RES_INIT
@@ -992,7 +983,7 @@
X_INCLUDES="-I$x_includes"
fi
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
+if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
X_LDFLAGS=""
x_libraries="/usr/lib"; dnl better than nothing :-
else
@@ -2756,7 +2747,7 @@
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+ LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS"
@@ -3024,6 +3015,35 @@
])
+
+AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
+[
+ AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
+ kde_cv_opt_noinline_match,
+ [
+ kde_cv_opt_noinline_match=irrelevant
+ dnl if we don't use both -O2 and -fno-inline, this check is moot
+ if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
+ && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
+
+ ac_cflags_save="$CFLAGS"
+ CFLAGS="$CFLAGS -D_USE_GNU"
+
+ AC_TRY_LINK([
+ #include <string.h>
+], [ const char *pt, *et;
+ et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ;
+],
+ kde_cv_opt_noinline_match=yes,
+ kde_cv_opt_noinline_match=no
+ )
+
+ CFLAGS="$ac_cflags_save"
+ fi
+ ])
+])
+
+
dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
[dnl
@@ -3108,7 +3128,7 @@
if test $kde_use_debug_code = "full"; then
CFLAGS="-g3 -fno-inline $CFLAGS"
else
- CFLAGS="-g -O2 $CFLAGS"
+ CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
fi
else
CFLAGS="-O2 $CFLAGS"
@@ -3143,7 +3163,7 @@
if test "$kde_use_debug_code" = "full"; then
CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
else
- CXXFLAGS="-g -O2 $CXXFLAGS"
+ CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
fi
fi
KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
@@ -3156,7 +3176,7 @@
CXXFLAGS="+K3 $CXXFLAGS"
else
CXXFLAGS="-O2 $CXXFLAGS"
- fi
+ fi
fi
fi
@@ -3178,7 +3198,7 @@
case $host in
*-*-linux-gnu)
CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+ CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
;;
@@ -3203,6 +3223,14 @@
AC_SUBST([HAVE_GCC_VISIBILITY])
if test "$GXX" = "yes"; then
+ gcc_no_reorder_blocks=NO
+ KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
+ if test $kde_use_debug_code != "no" && \
+ test $kde_use_debug_code != "full" && \
+ test "YES" = "$gcc_no_reorder_blocks" ; then
+ CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
+ CFLAGS="$CFLAGS -fno-reorder-blocks"
+ fi
KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
@@ -3231,6 +3259,11 @@
fi
rm -f conftest.h conftest.h.gch
fi
+
+ KDE_CHECK_FOR_OPT_NOINLINE_MATCH
+ if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+ CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+ fi
fi
AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
if test "$CXX" = "KCC"; then
@@ -3466,17 +3499,27 @@
AC_DEFUN([KDE_CHECK_LIB64],
[
- kdelibsuff="$kde_libs_suffix"
- if test -z "$kdelibsuff"; then
- kdelibsuff=no
- fi
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
- [/lib directory suffix (64,32,none[=default])]),
- kdelibsuff=$enableval)
- # TODO: add an auto case that compiles a little C app to check
- # where the glibc is
- if test "$kdelibsuff" = "no"; then
+ [/lib directory suffix (64,32,none,auto[=default])]),
+ kdelibsuff=$enableval, kdelibsuff="auto")
+
+ if test "$kdelibsuff" = "auto"; then
+
+cat > conftest.c << EOF
+#include <stdio.h>
+int main() {
+ return 0;
+}
+EOF
+ kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
+ s,.*/lib\([[^\/]]*\)/.*,\1,
+ p
+}'`
+ rm -rf conftest.*
+ fi
+
+ if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -4581,12 +4624,14 @@
AC_DEFUN([KDE_CHECK_PYTHON],
[
- KDE_CHECK_PYTHON_INTERN("2.4",
- [KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
- [KDE_CHECK_PYTHON_INTERN("2.1",
- [KDE_CHECK_PYTHON_INTERN("2.0",
- [KDE_CHECK_PYTHON_INTERN($1, $2) ])
+ KDE_CHECK_PYTHON_INTERN("2.5",
+ [KDE_CHECK_PYTHON_INTERN("2.4",
+ [KDE_CHECK_PYTHON_INTERN("2.3",
+ [KDE_CHECK_PYTHON_INTERN("2.2",
+ [KDE_CHECK_PYTHON_INTERN("2.1",
+ [KDE_CHECK_PYTHON_INTERN("2.0",
+ [KDE_CHECK_PYTHON_INTERN($1, $2) ])
+ ])
])
])
])
@@ -4954,7 +4999,6 @@
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix`
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
@@ -5171,9 +5215,10 @@
for dir in $javadirs; do
dnl Check for the java executable
if test -x "$dir/java"; then
+ sane_path=$(cd $dir; /bin/pwd)
dnl And also check for a libjvm.so somewhere under there
dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
- if test "$dir" != "/usr/bin"; then
+ if test "$sane_path" != "/usr/bin"; then
libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
if test ! -f $libjvmdir/libjvm.so; then continue; fi
jredirs="$jredirs $dir"
@@ -5330,7 +5375,7 @@
JAVAC=$kde_java_bindir/javac
JAVAH=$kde_java_bindir/javah
JAR=$kde_java_bindir/jar
- JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
+ JVMLIBS="-Wl,-framework,JavaVM"
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
AC_MSG_RESULT([Apple Java Framework])
@@ -5873,12 +5918,12 @@
dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [
- PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then
- PKG_CONFIG_PATH="$kde_libs_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi
export PKG_CONFIG_PATH
- PKG_CHECK_MODULES($1,$2,$3,$4)
+ PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
])
@@ -5891,7 +5936,7 @@
AC_LANG_CPLUSPLUS
safe_CXXFLAGS=$CXXFLAGS
safe_LDFLAGS=$LDFLAGS
- CXXFLAGS="$CXXFLAGS -fpie"
+ CXXFLAGS="$CXXFLAGS -fPIE"
LDFLAGS="$LDFLAGS -pie"
AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
@@ -5901,7 +5946,7 @@
AC_LANG_RESTORE
])
- AC_MSG_CHECKING(if enabling -pie/fpie support)
+ AC_MSG_CHECKING(if enabling -pie/fPIE support)
AC_ARG_ENABLE(pie,
AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
@@ -5921,7 +5966,7 @@
AC_SUBST([KDE_USE_PIE])
if test "$kde_has_pie_support" = "yes"; then
- KDE_USE_FPIE="-fpie"
+ KDE_USE_FPIE="-fPIE"
KDE_USE_PIE="-pie"
fi
])
Modified: prog/trunk/admin/am_edit
===================================================================
--- prog/trunk/admin/am_edit 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/am_edit 2007-10-08 13:24:46 UTC (rev 129)
@@ -2028,7 +2028,7 @@
$lines .= "\n";
$lines .= "uninstall-docs:\n";
- $lines .= "\t-rm -rf \$(kde_htmldir)/$kdelang/$appname\n";
+ $lines .= "\t-rm -rf \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
$lines .= "\n";
$lines .= "clean-docs:\n";
$lines .= "\t-rm -f index.cache.bz2\n";
@@ -2353,7 +2353,7 @@
$MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
# Append our $progId line, _below_ the "generated by automake" line
# because automake-1.6 relies on the first line to be his own.
- my $progIdLine = "\# $progId - " . '$Revision: 435799 $ '."\n";
+ my $progIdLine = "\# $progId - " . '$Revision: 483858 $ '."\n";
if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
warn "automake line not found in $makefile\n";
# Fallback: first line
Modified: prog/trunk/admin/config.guess
===================================================================
--- prog/trunk/admin/config.guess 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/config.guess 2007-10-08 13:24:46 UTC (rev 129)
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-07-08'
+timestamp='2005-06-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (gh...@no... 1994-08-24)
@@ -623,7 +623,8 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- eval $set_cc_for_build
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
Modified: prog/trunk/admin/config.sub
===================================================================
--- prog/trunk/admin/config.sub 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/config.sub 2007-10-08 13:24:46 UTC (rev 129)
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-07-08'
+timestamp='2005-07-01'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -264,7 +264,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b \
@@ -344,7 +344,7 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
| sparclite-* \
@@ -1098,7 +1098,7 @@
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b)
@@ -1187,8 +1187,7 @@
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1206,7 +1205,7 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@@ -1395,9 +1394,6 @@
*-be)
os=-beos
;;
- *-haiku)
- os=-haiku
- ;;
*-ibm)
os=-aix
;;
Modified: prog/trunk/admin/configure.in.bot.end
===================================================================
--- prog/trunk/admin/configure.in.bot.end 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/configure.in.bot.end 2007-10-08 13:24:46 UTC (rev 129)
@@ -1,3 +1,36 @@
+# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
+if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
+ # And if so, warn when they don't match
+ if test "$kde_libs_prefix" != "$given_prefix"; then
+ # And if kde doesn't know about the prefix yet
+ echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+ if test $? -ne 0; then
+ echo ""
+ echo "Warning: you chose to install this package in $given_prefix,"
+ echo "but KDE was found in $kde_libs_prefix."
+ echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
+ echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+ echo "Then restart KDE."
+ echo ""
+ fi
+ fi
+fi
+
+if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
+ echo ""
+ echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
+ echo "was not included. Therefore, GCC symbol visibility support remains disabled."
+ echo ""
+ echo "For better performance, consider including the Qt visibility supporting patch"
+ echo "located at:"
+ echo ""
+ echo "http://bugs.kde.org/show_bug.cgi?id=109386"
+ echo ""
+ echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
+ echo "everything will continue to work just fine without it."
+ echo ""
+fi
+
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
echo ""
Modified: prog/trunk/admin/cvs.sh
===================================================================
--- prog/trunk/admin/cvs.sh 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/cvs.sh 2007-10-08 13:24:46 UTC (rev 129)
@@ -32,7 +32,7 @@
required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* ) : ;;
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* ) : ;;
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
echo "*** KDE requires autoheader $required_autoconf_version"
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.0\""
+ VERSION="\"3.5.8\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
Modified: prog/trunk/admin/detect-autoconf.pl
===================================================================
--- prog/trunk/admin/detect-autoconf.pl 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/detect-autoconf.pl 2007-10-08 13:24:46 UTC (rev 129)
@@ -46,6 +46,8 @@
($version) = $file =~ /$prefix\/$program-?(.*)$/;
$version =~ s/-|\.//g;
+ # Don't check the -wrapper ones
+ next if $version eq "wrapper";
# Special case some programs to make sure it has a minimum version.
if (not $version and exists $minimumVersions{$program})
Modified: prog/trunk/admin/doxygen.sh
===================================================================
--- prog/trunk/admin/doxygen.sh 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/doxygen.sh 2007-10-08 13:24:46 UTC (rev 129)
@@ -63,15 +63,18 @@
echo "Usage: doxygen.sh <top_srcdir>"
exit 1
fi
-if ! test -d "$top_srcdir" ; then
+if test ! -d "$top_srcdir" ; then
echo "top_srcdir ($top_srcdir) is not a directory."
exit 1
fi
### Normalize top_srcdir so it is an absolute path.
-if ! expr "x$top_srcdir" : "x/" > /dev/null ; then
+if expr "x$top_srcdir" : "x/" > /dev/null ; then
+ # top_srcdir is absolute already
+ :
+else
top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd`
- if ! test -d "$top_srcdir" ; then
+ if test ! -d "$top_srcdir" ; then
echo "top_srcdir ($top_srcdir) is not a directory."
exit 1
fi
@@ -95,7 +98,7 @@
done
fi
fi
-if test -z "$QTDOCDIR" || test \! -d "$QTDOCDIR" ; then
+if test -z "$QTDOCDIR" || test ! -d "$QTDOCDIR" ; then
if test -z "$QTDOCDIR" ; then
echo "* QTDOCDIR could not be guessed."
else
@@ -137,7 +140,7 @@
DOXDATA="$top_srcdir/doc/common"
fi
-if ! test -d "$DOXDATA" ; then
+if test ! -d "$DOXDATA" ; then
echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\""
exit 1
fi
@@ -155,7 +158,7 @@
{
eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"`
echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in
- grep ^KDE_INIT_DOXYGEN "$top_srcdir/configure.in.in" | \
+ grep '^KDE_INIT_DOXYGEN' "$top_srcdir/configure.in.in" | \
sed -e 's+[^[]*\[\([^]]*\)+PROJECT_NAME = "\1"+' \
-e 's+].*++' >> Doxyfile.in
}
@@ -167,13 +170,13 @@
### for the apidox and initialize it. Otherwise, just use the
### structure assumed to be there.
if test -z "$subdir" ; then
- if ! test -d "$apidoxdir" ; then
+ if test ! -d "$apidoxdir" ; then
mkdir "$apidoxdir" > /dev/null 2>&1
fi
- if ! cd "$apidoxdir" > /dev/null 2>&1 ; then
+ cd "$apidoxdir" > /dev/null 2>&1 || {
echo "Cannot create and cd into $apidoxdir"
exit 1
- fi
+ }
test -f "Doxyfile.in" || create_doxyfile_in
@@ -192,15 +195,15 @@
srcdir="$1"
subdir="."
else
- if ! cd "$apidoxdir" > /dev/null 2>&1 ; then
+ cd "$apidoxdir" > /dev/null 2>&1 || {
echo "Cannot cd into $apidoxdir -- maybe you need to"
echo "build the top-level dox first."
exit 1
- fi
+ }
if test "x1" = "x$recurse" ; then
# OK, so --recurse was requested
- if ! test -f "subdirs.top" ; then
+ if test ! -f "subdirs.top" ; then
echo "* No subdirs.top available in the $apidoxdir."
echo "* The --recurse option will be ignored."
recurse=0
@@ -389,7 +392,10 @@
test -f "$subdir/classmap.inc" && \
CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"\([^"]*\)" => "'"$subdir/html/"'\([^"]*\)"+<option value="\2">\1<\/option>+' | tr -d '\n'`
- if ! test -f "$subdir/classmap.inc" || ! grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then
+ if test -f "$subdir/classmap.inc" && grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then
+ # Keep the menu, it's useful
+ :
+ else
CMENUBEGIN="<!--"
CMENUEND="-->"
fi
@@ -467,7 +473,7 @@
doxygen Doxyfile
- ( cd "$top_srcdir" && grep -l ^include.*Doxyfile.am `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in
+ ( cd "$top_srcdir" && grep -l '^include.*Doxyfile.am' `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in
for i in `cat subdirs.in`
do
test "x." = "x$i" && continue;
@@ -500,7 +506,7 @@
echo "*** Creating apidox in $subdir"
echo "*"
rm -f "$subdir/Doxyfile"
- if ! test -d "$top_srcdir/$subdir" ; then
+ if test ! -d "$top_srcdir/$subdir" ; then
echo "* No source (sub)directory $subdir"
return
fi
@@ -623,7 +629,12 @@
apidox_local
- if ! grep '^DOXYGEN_EMPTY' "$srcdir/Makefile.am" > /dev/null 2>&1 ; then
+ if grep '^DOXYGEN_EMPTY' "$srcdir/Makefile.am" > /dev/null 2>&1 ; then
+ # This directory is empty, so don't process it, but
+ # *do* handle subdirs that might have dox.
+ :
+ else
+ # Regular processing
doxygen "$subdir/Doxyfile"
doxyndex
fi
@@ -636,7 +647,7 @@
srcdir="$top_srcdir/$subdir"
subdirname=`basename "$subdir"`
mkdir -p "$subdir" 2> /dev/null
- if ! test -d "$subdir" ; then
+ if test ! -d "$subdir" ; then
echo "Can't create dox subdirectory $subdir"
return
fi
Modified: prog/trunk/admin/install-sh
===================================================================
--- prog/trunk/admin/install-sh 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/install-sh 2007-10-08 13:24:46 UTC (rev 129)
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-05-14.22
+scriptversion=2005-11-07.23
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -58,7 +58,21 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Symbolic mode for testing mkdir with directories.
+# It is the same as 755, but also tests that "u+" works.
+test_mode=u=rwx,g=rx,o=rx,u+wx
+
+# Desired mode of installed file.
+mode=0755
+
+# Desired mode of newly created intermediate directories.
+# It is empty if not known yet.
+intermediate_mode=
+
+chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
stripcmd=
@@ -111,7 +125,7 @@
--help) echo "$usage"; exit $?;;
- -m) chmodcmd="$chmodprog $2"
+ -m) mode=$2
shift
shift
continue;;
@@ -164,6 +178,8 @@
exit 0
fi
+test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
+
for src
do
# Protect names starting with `-'.
@@ -173,15 +189,11 @@
if test -n "$dir_arg"; then
dst=$src
- src=
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
- else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +220,122 @@
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
- dst=$dst/`basename "$src"`
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
fi
fi
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+ obsolete_mkdir_used=false
- # Make sure that the destination directory exists.
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ posix_mkdir=false
+ if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
+ posix_mkdir=true
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
+ fi ;;
+ esac
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
+ if
+ $posix_mkdir && {
- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- shift
- IFS=$oIFS
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, create it using the same intermediate mode that
+ # mkdir -p would use when creating intermediate directories.
+ # POSIX says that this mode is "$(umask -S),u+wx", so use that
+ # if umask -S works.
- pathcomp=
+ if test -n "$dir_arg"; then
+ mkdir_mode=$mode
+ else
+ case $intermediate_mode in
+ '')
+ if umask_S=`(umask -S) 2>/dev/null`; then
+ intermediate_mode=$umask_S,u+wx
+ else
+ intermediate_mode=$test_mode
+ fi ;;
+ esac
+ mkdir_mode=$intermediate_mode
+ fi
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
+ $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+ }
+ then :
+ else
+
+ # mkdir does not conform to POSIX, or it failed possibly due to
+ # a race condition. Create the directory the slow way, step by
+ # step, checking for races as we go.
+
+ case $dstdir in
+ /*) pathcomp=/ ;;
+ -*) pathcomp=./ ;;
+ *) pathcomp= ;;
+ esac
+
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob && set -f
+ set fnord $dstdir
shift
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
- fi
- pathcomp=$pathcomp/
- done
+ $posix_glob && set +f
+ IFS=$oIFS
+
+ for d
+ do
+ test "x$d" = x && continue
+
+ pathcomp=$pathcomp$d
+ if test ! -d "$pathcomp"; then
+ $mkdirprog "$pathcomp"
+ # Don't fail if two instances are running concurrently.
+ test -d "$pathcomp" || exit 1
+ fi
+ pathcomp=$pathcomp/
+ done
+ obsolete_mkdir_used=true
+ fi
fi
if test -n "$dir_arg"; then
- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
else
- dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -262,7 +343,6 @@
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
$doit $cpprog "$src" "$dsttmp" &&
@@ -276,10 +356,10 @@
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
# Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +371,12 @@
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|| {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
else
@@ -304,17 +385,14 @@
} &&
# Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ $doit $mvcmd "$dsttmp" "$dst"
}
- }
- fi || { (exit 1); exit 1; }
+ } || exit 1
+
+ trap '' 0
+ fi
done
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit 0
-}
-
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
Modified: prog/trunk/admin/libtool.m4.in
===================================================================
--- prog/trunk/admin/libtool.m4.in 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/libtool.m4.in 2007-10-08 13:24:46 UTC (rev 129)
@@ -1424,7 +1424,7 @@
libsuff=
if test "x$LINUX_64_MODE" = x64; then
# Some platforms are per default 64-bit, so there's no /lib64
- if test -d /lib64; then
+ if test -d /lib64 -a ! -h /lib64; then
libsuff=64
fi
fi
Modified: prog/trunk/admin/ltmain.sh
===================================================================
--- prog/trunk/admin/ltmain.sh 2007-10-08 09:05:41 UTC (rev 128)
+++ prog/trunk/admin/ltmain.sh 2007-10-08 13:24:46 UTC (rev 129)
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
# Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <go...@gn...>, 1996
#
@@ -24,40 +24,6 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
@@ -70,7 +36,7 @@
:
else
# Restart under the correct shell, and then maybe $echo will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ exec $SHELL "$0" --no-reexec ${1+"$@"}
fi
if test "X$1" = X--fallback-echo; then
@@ -79,9 +45,19 @@
cat <<EOF
$*
EOF
- exit $EXIT_SUCCESS
+ exit 0
fi
+# The name of this program.
+progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+modename="$progname"
+
+# Constants.
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5a
+TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
+
default_mode=
help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
@@ -94,15 +70,14 @@
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- SP2NL='tr \040 \012'
- NL2SP='tr \015\012 \040\040'
+case `echo A|tr A '\301'` in
+ A) # EBCDIC based system
+ SP2NL="tr '\100' '\n'"
+ NL2SP="tr '\r\n' '\100\100'"
;;
- *) # EBCDIC based system
- SP2NL='tr \100 \n'
- NL2SP='tr \r\n \100\100'
+ *) # Assume ASCII based system
+ SP2NL="tr '\040' '\012'"
+ NL2SP="tr '\015\012' '\040\040'"
;;
esac
@@ -111,24 +86,20 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
- export $lt_var
- fi"
-done
+if test "${LC_ALL+set}" = ...
[truncated message content] |
|
From: <dio...@us...> - 2007-10-08 09:05:39
|
Revision: 128
http://pikloops.svn.sourceforge.net/pikloops/?rev=128&view=rev
Author: dionysos-sf
Date: 2007-10-08 02:05:41 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Add new style for distribution logo
Modified Paths:
--------------
web/trunk/styles/main.css
Modified: web/trunk/styles/main.css
===================================================================
--- web/trunk/styles/main.css 2007-10-05 15:49:22 UTC (rev 127)
+++ web/trunk/styles/main.css 2007-10-08 09:05:41 UTC (rev 128)
@@ -26,6 +26,13 @@
padding-bottom: 0px;
}
+img.logo-distrib {
+ width: 36px;
+ height: 36px;
+ vertical-align: bottom;
+ margin-right: 1em;
+}
+
#sf {
text-align: left;
width: 125px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-05 15:49:19
|
Revision: 127
http://pikloops.svn.sourceforge.net/pikloops/?rev=127&view=rev
Author: dionysos-sf
Date: 2007-10-05 08:49:22 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Add some useful icons
Added Paths:
-----------
web/trunk/images/logos/
web/trunk/images/logos/bzip-compressed-tar-logo-icon-36x36.png
web/trunk/images/logos/cpp-logo-icon-36x36.png
web/trunk/images/logos/fedora-logo-icon-36x36.png
web/trunk/images/logos/mandriva-logo-icon-36x36.png
web/trunk/images/logos/opensuse-logo-icon-36x36.png
web/trunk/images/logos/rpm-logo-icon-36x36.png
Added: web/trunk/images/logos/bzip-compressed-tar-logo-icon-36x36.png
===================================================================
(Binary files differ)
Property changes on: web/trunk/images/logos/bzip-compressed-tar-logo-icon-36x36.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: web/trunk/images/logos/cpp-logo-icon-36x36.png
===================================================================
(Binary files differ)
Property changes on: web/trunk/images/logos/cpp-logo-icon-36x36.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: web/trunk/images/logos/fedora-logo-icon-36x36.png
===================================================================
(Binary files differ)
Property changes on: web/trunk/images/logos/fedora-logo-icon-36x36.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: web/trunk/images/logos/mandriva-logo-icon-36x36.png
===================================================================
(Binary files differ)
Property changes on: web/trunk/images/logos/mandriva-logo-icon-36x36.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: web/trunk/images/logos/opensuse-logo-icon-36x36.png
===================================================================
(Binary files differ)
Property changes on: web/trunk/images/logos/opensuse-logo-icon-36x36.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: web/trunk/images/logos/rpm-logo-icon-36x36.png
===================================================================
(Binary files differ)
Property changes on: web/trunk/images/logos/rpm-logo-icon-36x36.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-02 08:45:07
|
Revision: 126
http://pikloops.svn.sourceforge.net/pikloops/?rev=126&view=rev
Author: dionysos-sf
Date: 2007-10-02 01:45:10 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Fix typo
Modified Paths:
--------------
web/trunk/po/fr.po
Modified: web/trunk/po/fr.po
===================================================================
--- web/trunk/po/fr.po 2007-10-01 16:32:44 UTC (rev 125)
+++ web/trunk/po/fr.po 2007-10-02 08:45:10 UTC (rev 126)
@@ -8,7 +8,7 @@
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-09-28 16:46+0200\n"
-"PO-Revision-Date: 2007-10-01 18:21+0200\n"
+"PO-Revision-Date: 2007-10-02 10:33+0200\n"
"Last-Translator: Alain PORTAL <ap...@un...>\n"
"Language-Team: Français <tr...@tr...>\n"
"MIME-Version: 1.0\n"
@@ -685,8 +685,8 @@
"meilleur logiciel EDA open source (GPL) que je connaisse. Conçu avec <a href="
"\"http://www.wxwidgets.org\">wxWidgets</a>, <a href=\"http://www.lis.inpg.fr/"
"realise_au_lis/kicad/\">Kicad</a> vous permet de saisir des schémas "
-"électronique et de router des circuits imprimés. Il fournit également une "
-"visualisateur GERBER de même qu'unvisualisateur 3D viewer lorsqu'il est "
+"électronique et de router des circuits imprimés. Il fournit également un "
+"visualisateur GERBER de même qu'un visualisateur 3D viewer lorsqu'il est "
"utilisé avec <a href=\"http://www.wings3d.org\">Wings 3d</a>"
#: ../links.php:30
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
