luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Complete support for project extra references.

Browse source 
[CONFIGURATION]
* NEW: Update version to 3.13.90.

[DEVELOPMENT ENVIRONMENT]
* NEW: Redone extra references support.

[COMPILER]
* NEW: Take project extra references into account.

[GB.TERM.FORM]
* BUG: Fix project description.
This commit is contained in:
gambas 2019-04-23 12:31:10 +02:00
parent 516de91f93
commit 7c0a6730cd
9 changed files with 48 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
3.12.90
3.13.90

12
app/src/gambas3/.src/Project.module
View file

@ -3253,7 +3253,7 @@ Public Sub ReadProject(Optional bConvert As Boolean)
'Else
hComp = Project.Documentation[sVal]
If hComp And If Not hComp.Hidden Then
Components.Add(sVal)
If Not Components.Exist(sVal) Then Components.Add(sVal)
Else
aMissing.Add(sVal)
Endif
@ -3510,8 +3510,8 @@ Public Sub ReadProject(Optional bConvert As Boolean)
Case "donottranslate"
DoNotTranslate = Split(sVal, ",", Chr$(34), True)
Case "extrareferences"
ExtraReferences = Split(sVal, ",", Chr$(34), True)
Case "reference"
If Not ExtraReferences.Exist(sVal) Then ExtraReferences.Add(sVal)
End Select
@ -3692,7 +3692,11 @@ Public Sub WriteProject(Optional bComponentDoNotChange As Boolean, Optional bMak
If DoNotTranslate.Count Then Print #hFic, "DoNotTranslate="; DoNotTranslate.Join(",", Chr$(34))
If ExtraReferences And If ExtraReferences.Count Then Print #hFic, "ExtraReferences="; ExtraReferences.Join(",", Chr$(34))
If ExtraReferences Then
For Each sVal In ExtraReferences
Print #hFic, "Reference="; sVal
Next
Endif
Close #hFic

BIN
comp/src/gb.term.form/.icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

16
comp/src/gb.term.form/.lang/it.po
View file

@ -2,6 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gb.term.form 3.12.90\n"
"POT-Creation-Date: 2019-04-23 10:07 UTC\n"
"PO-Revision-Date: 2019-01-12 16:39 UTC\n"
"Last-Translator: gian <gian@gian>\n"
"Language: it\n"
@ -10,10 +11,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: .project:2
msgid "This components aim to give a set of tools to dialog with a VT102 terminal.\n\nIt provide a way to use common visual objects like windows, standart controls like label, checkbos, list and more... like in graphical mode.\n\nIt will have also a standalone class with common VT100 command to be used for more simple applications."
msgstr "Questi componenti mirano a fornire un set di strumenti per dialogare con un terminale VT102.\n\nConsente di utilizzare oggetti visivi comuni come finestre, controlli standard, etichette, checkbox, elenchi e altro... come in modalità grafica.\n\nSarà anche una classe standalone con comune comando VT100 da utilizzare per applicazioni più semplici."
msgid ""
"This components aim to give a set of tools to dialog with a VT102 terminal.\n"
"\n"
"It provide a way to use common visual objects like windows, standart controls like label, checkbos, list and more... like in graphical mode.\n"
"\n"
"It will have also a standalone class with common VT100 command to be used for more simple applications."
msgstr ""
"Questi componenti mirano a fornire un set di strumenti per dialogare con un terminale VT102.\n"
"\n"
"Consente di utilizzare oggetti visivi comuni come finestre, controlli standard, etichette, checkbox, elenchi e altro... come in modalità grafica.\n"
"\n"
"Sarà anche una classe standalone con comune comando VT100 da utilizzare per applicazioni più semplici."
#: Termform1.termform:17
msgid "Bonjour"
msgstr "Buongiorno"

21
comp/src/gb.term.form/.lang/nl.po
View file

@ -3,6 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gb.term.form 3.12.2\n"
"POT-Creation-Date: 2019-04-23 10:07 UTC\n"
"PO-Revision-Date: 2019-04-06 18:46 UTC\n"
"Last-Translator: gbWilly <gbWilly@openmailbox.org>\n"
"Language: nl\n"
@ -11,14 +12,22 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: .project:2
msgid "This components aim to give a set of tools to dialog with a VT102 terminal.\n\nIt provide a way to use common visual objects like windows, standart controls like label, checkbos, list and more... like in graphical mode.\n\nIt will have also a standalone class with common VT100 command to be used for more simple applications."
msgstr "Doel van dit component is om een set instrumenten beschikbaar te stellen om de dialoog met een VT102 terminal aan te gaan.\n\nHet voorziet in een manier om gebruikelijke visuele objecten zoals vensters, standaard controls zoals label, checkbox, lijsten en meer te gebruiken...zoals in grafische modus.\n\nHet zal ook een standalone klasse bevatten met gebruikelijke VT100 comando's voor gebruik in simpelere applicaties."
#: Termform1.termform:
msgid "Click me !"
msgstr "Klik mij !"
msgid ""
"This components aim to give a set of tools to dialog with a VT102 terminal.\n"
"\n"
"It provide a way to use common visual objects like windows, standart controls like label, checkbos, list and more... like in graphical mode.\n"
"\n"
"It will have also a standalone class with common VT100 command to be used for more simple applications."
msgstr ""
"Doel van dit component is om een set instrumenten beschikbaar te stellen om de dialoog met een VT102 terminal aan te gaan.\n"
"\n"
"Het voorziet in een manier om gebruikelijke visuele objecten zoals vensters, standaard controls zoals label, checkbox, lijsten en meer te gebruiken...zoals in grafische modus.\n"
"\n"
"Het zal ook een standalone klasse bevatten met gebruikelijke VT100 comando's voor gebruik in simpelere applicaties."
#: Termform1.termform:17
msgid "Bonjour"
msgstr "-"
#~ msgid "Click me !"
#~ msgstr "Klik mij !"

3
comp/src/gb.term.form/.project
View file

@ -7,10 +7,11 @@ VersionFile=1
Component=gb.image
Component=gb.image.io
Component=gb.term
Description="This components aim to give a set of tools to dialog with a VT102 terminal.\n\nIt provide a way to use common visual objects like windows, standart controls like label, checkbos, list and more... like in graphical mode.\n\nIt will have also a standalone class with common VT100 command to be used for more simple applications."
Description="This components allows to dialog with a VT102 terminal.\n\nIt provides a way to use common visual objects like windows, standard controls like labels, checkboxes, lists and so on... as in graphical mode.\n\nIt will also provide a standalone class with common VT100 commands to be used by more simple applications."
Authors="Fabien Bodard (gambas.fr@gmail.com)"
TabSize=2
Translate=1
Language=en_US
Type=Component
Packager=1
DoNotTranslate=".src/Test"

2
main/gbc/gbc.c
View file

@ -528,7 +528,7 @@ static void compile_lang(void)
unlink(file_mo);
// Shell "msgfmt -o " & Shell$(sPath) & " " & Shell(sTrans) Wait
cmd = STR_print("msgfmt -o %s %s", file_mo, file_po);
cmd = STR_print("msgfmt -o %s %s >/dev/null 2>&1", file_mo, file_po);
if (main_verbose)
printf("running: %s\n", cmd);
ret = system(cmd);

8
main/gbc/gbc_compile.c
View file

@ -146,7 +146,7 @@ static void add_file_list(FILE *fi)
}
}
static void add_library_list_file(const char *path)
static void add_library_list_file(const char *path, bool ref)
{
ARCH *arch;
ARCH_FIND find;
@ -186,7 +186,7 @@ static void add_library_list_file(const char *path)
ARCH_close(arch);
}
else
ERROR_warning("cannot find library: %s", name);
ERROR_warning((ref ? "cannot find reference: %s" : "cannot find library: %s"), name);
if (rpath)
STR_free(rpath);
@ -483,7 +483,9 @@ void COMPILE_init(void)
if (strncmp(line, "Component=", 10) == 0)
add_component_list_file(&line[10]);
else if (strncmp(line, "Library=", 8) == 0)
add_library_list_file(&line[8]);
add_library_list_file(&line[8], FALSE);
else if (strncmp(line, "Reference=", 10) == 0)
add_library_list_file(&line[10], TRUE);
}
fclose(fp);

6
version.m4
View file

@ -1,13 +1,13 @@
## Package version and e-mail for bugs are defined here
m4_define([GB_VERSION], [3.12.90])
m4_define([GB_VERSION], [3.13.90])
m4_define([GB_MAIL], [gambas@users.sourceforge.net])
m4_define([GB_URL], [http://gambas.sourceforge.net])
m4_define([GB_VERSION_MAJOR], [3])
m4_define([GB_VERSION_MINOR], [12])
m4_define([GB_VERSION_MINOR], [13])
m4_define([GB_VERSION_RELEASE], [90])
m4_define([GB_VERSION_FULL], [0x03120090])
m4_define([GB_VERSION_FULL], [0x03130090])
m4_define([GB_PCODE_VERSION], [0x03080000])
m4_define([GB_PCODE_VERSION_MIN],[0x03000000])