Download as
Browse Code »

Commit 1592e9ee6d2f118f55f056c8980fd4bf5c5b9c6f

Authored by Perry Werneck
1 parent 598519c6
Exists in master and in 1 other branch develop

Fixing CodeQL workflow.

Showing 4 changed files with 28 additions and 25 deletions   Show diff stats
.github/workflows/codeql.yml
  Diff comments   View file @1592e9e
@@ -30,7 +30,7 @@ jobs: @@ -30,7 +30,7 @@ jobs:
30 echo 'deb http://download.opensuse.org/repositories/home:/PerryWerneck:/pw3270/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/home:PerryWerneck:pw3270.list 30 echo 'deb http://download.opensuse.org/repositories/home:/PerryWerneck:/pw3270/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/home:PerryWerneck:pw3270.list
31 curl -fsSL https://download.opensuse.org/repositories/home:PerryWerneck:pw3270/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_PerryWerneck_pw3270.gpg > /dev/null 31 curl -fsSL https://download.opensuse.org/repositories/home:PerryWerneck:pw3270/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_PerryWerneck_pw3270.gpg > /dev/null
32 sudo apt-get update 32 sudo apt-get update
33 - sudo apt-get install --yes git make autopoint gettext lib3270-dev pkg-config libgtk-3-dev imagemagick lib3270-dev libv3270-dev 33 + sudo apt-get install --yes git make autopoint gettext pkg-config libgtk-3-dev imagemagick lib3270-dev libv3270-dev
34 - name: Initialize CodeQL 34 - name: Initialize CodeQL
35 uses: github/codeql-action/init@v2 35 uses: github/codeql-action/init@v2
36 with: 36 with:
@@ -135,15 +135,6 @@ $(OBJDBG)/%.o: \ @@ -135,15 +135,6 @@ $(OBJDBG)/%.o: \
135 @$(MKDIR) $(@D) 135 @$(MKDIR) $(@D)
136 @$(WINDRES) $< -O coff -o $@ 136 @$(WINDRES) $< -O coff -o $@
137 137
138 -gschemas.compiled: \  
139 - $(foreach SCHEMA, $(notdir $(SCHEMAS)), $(OBJDIR)/schemas/$(SCHEMA))  
140 -  
141 - @$(MKDIR) $(OBJDIR)/schemas  
142 -  
143 - @glib-compile-schemas \  
144 - --targetdir=$(@D) \  
145 - $(OBJDIR)/schemas  
146 -  
147 #---[ Release Rules ]-------------------------------------------------------------------- 138 #---[ Release Rules ]--------------------------------------------------------------------
148 139
149 $(OBJRLS)/%.o: \ 140 $(OBJRLS)/%.o: \
@@ -251,12 +242,15 @@ install-%: \ @@ -251,12 +242,15 @@ install-%: \
251 $< \ 242 $< \
252 $@ 243 $@
253 244
254 -#---[ Release Targets ]------------------------------------------------------------------ 245 +#---[ Main Target ]----------------------------------------------------------------------
255 246
256 all: \ 247 all: \
257 $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \ 248 $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \
258 locale 249 locale
259 250
  251 +
  252 +#---[ Release Targets ]------------------------------------------------------------------
  253 +
260 locale: \ 254 locale: \
261 locale/$(PACKAGE_NAME).pot 255 locale/$(PACKAGE_NAME).pot
262 256
@@ -352,6 +346,15 @@ install-icons: @@ -352,6 +346,15 @@ install-icons:
352 346
353 #---[ Misc Targets ]--------------------------------------------------------------------- 347 #---[ Misc Targets ]---------------------------------------------------------------------
354 348
  349 +gschemas.compiled: \
  350 + $(foreach SCHEMA, $(notdir $(SCHEMAS)), $(OBJDIR)/schemas/$(SCHEMA))
  351 +
  352 + @$(MKDIR) $(OBJDIR)/schemas
  353 +
  354 + @glib-compile-schemas \
  355 + --targetdir=$(@D) \
  356 + $(OBJDIR)/schemas
  357 +
355 locale/$(PACKAGE_NAME).pot: \ 358 locale/$(PACKAGE_NAME).pot: \
356 $(foreach SRC, $(basename $(COMMON_SOURCES)), $(POTDIR)/$(SRC).pot) \ 359 $(foreach SRC, $(basename $(COMMON_SOURCES)), $(POTDIR)/$(SRC).pot) \
357 $(foreach SRC, $(basename $(wildcard $(srcdir)/src/objects/os/linux/*.c)), $(POTDIR)/$(SRC).pot) \ 360 $(foreach SRC, $(basename $(wildcard $(srcdir)/src/objects/os/linux/*.c)), $(POTDIR)/$(SRC).pot) \
locale/pt_BR.po
  Diff comments   View file @1592e9e
@@ -5,7 +5,7 @@ msgid &quot;&quot; @@ -5,7 +5,7 @@ msgid &quot;&quot;
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2022-05-18 15:30-0300\n" 8 +"POT-Creation-Date: 2022-12-14 20:10-0300\n"
9 "PO-Revision-Date: 2021-12-23 01:36-0300\n" 9 "PO-Revision-Date: 2021-12-23 01:36-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Brazilian Portuguese <perry.werneck@gmail.com>\n" 11 "Language-Team: Brazilian Portuguese <perry.werneck@gmail.com>\n"
@@ -37,7 +37,7 @@ msgstr &quot;Linux 32 bits&quot; @@ -37,7 +37,7 @@ msgstr &quot;Linux 32 bits&quot;
37 msgid "32 bits Windows" 37 msgid "32 bits Windows"
38 msgstr "Windows 32 bits" 38 msgstr "Windows 32 bits"
39 39
40 -#: src/objects/actions/save.c:166 src/objects/os/linux/savedesktopicon.c:233 40 +#: src/objects/actions/save.c:167 src/objects/os/linux/savedesktopicon.c:233
41 #: src/objects/os/windows/savedesktopicon.c:222 41 #: src/objects/os/windows/savedesktopicon.c:222
42 msgid "3270 session files" 42 msgid "3270 session files"
43 msgstr "Arquivos de sessão TN3270" 43 msgstr "Arquivos de sessão TN3270"
@@ -478,7 +478,7 @@ msgstr &quot;Altura do painel em linhas&quot; @@ -478,7 +478,7 @@ msgstr &quot;Altura do painel em linhas&quot;
478 msgid "Keypad width in columns" 478 msgid "Keypad width in columns"
479 msgstr "Largura do painel em colunas" 479 msgstr "Largura do painel em colunas"
480 480
481 -#: src/main/builder.c:118 481 +#: src/main/builder.c:135
482 msgid "Keypads" 482 msgid "Keypads"
483 msgstr "Painéis" 483 msgstr "Painéis"
484 484
@@ -713,7 +713,7 @@ msgstr &quot;Salvar tela&quot; @@ -713,7 +713,7 @@ msgstr &quot;Salvar tela&quot;
713 msgid "Save selected" 713 msgid "Save selected"
714 msgstr "Salvar seleção" 714 msgstr "Salvar seleção"
715 715
716 -#: src/objects/actions/save.c:75 src/objects/actions/save.c:163 716 +#: src/objects/actions/save.c:75 src/objects/actions/save.c:164
717 msgid "Save session preferences" 717 msgid "Save session preferences"
718 msgstr "Salvar preferências da sessão" 718 msgstr "Salvar preferências da sessão"
719 719
@@ -918,7 +918,7 @@ msgstr &quot;Erro nas configurações de sistema&quot; @@ -918,7 +918,7 @@ msgstr &quot;Erro nas configurações de sistema&quot;
918 msgid "TN3270 Session Files" 918 msgid "TN3270 Session Files"
919 msgstr "Arquivos de sessão TN3270" 919 msgstr "Arquivos de sessão TN3270"
920 920
921 -#: src/objects/window/keyfile.c:237 921 +#: src/objects/window/keyfile.c:241
922 msgid "TN3270 Session description" 922 msgid "TN3270 Session description"
923 msgstr "Descrição de sessão TN3270" 923 msgstr "Descrição de sessão TN3270"
924 924
@@ -1148,7 +1148,7 @@ msgstr &quot;Atalhos windows&quot; @@ -1148,7 +1148,7 @@ msgstr &quot;Atalhos windows&quot;
1148 msgid "_Apply" 1148 msgid "_Apply"
1149 msgstr "_Aplicar" 1149 msgstr "_Aplicar"
1150 1150
1151 -#: src/objects/actions/save.c:102 src/objects/settings/dialog.c:78 1151 +#: src/objects/actions/save.c:103 src/objects/settings/dialog.c:78
1152 #: src/objects/os/linux/savedesktopicon.c:140 1152 #: src/objects/os/linux/savedesktopicon.c:140
1153 #: src/objects/os/windows/savedesktopicon.c:132 1153 #: src/objects/os/windows/savedesktopicon.c:132
1154 msgid "_Cancel" 1154 msgid "_Cancel"
@@ -1199,7 +1199,7 @@ msgstr &quot;_Preferências&quot; @@ -1199,7 +1199,7 @@ msgstr &quot;_Preferências&quot;
1199 msgid "_Rename session" 1199 msgid "_Rename session"
1200 msgstr "Renomear sessão" 1200 msgstr "Renomear sessão"
1201 1201
1202 -#: src/objects/actions/save.c:103 src/objects/os/linux/savedesktopicon.c:141 1202 +#: src/objects/actions/save.c:104 src/objects/os/linux/savedesktopicon.c:141
1203 #: src/objects/os/windows/savedesktopicon.c:133 1203 #: src/objects/os/windows/savedesktopicon.c:133
1204 msgid "_Save" 1204 msgid "_Save"
1205 msgstr "_Salvar" 1205 msgstr "_Salvar"
locale/pw3270.pot
  Diff comments   View file @1592e9e
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2022-05-18 15:30-0300\n" 11 +"POT-Creation-Date: 2022-12-14 20:10-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,7 +35,7 @@ msgstr &quot;&quot; @@ -35,7 +35,7 @@ msgstr &quot;&quot;
35 msgid "32 bits Windows" 35 msgid "32 bits Windows"
36 msgstr "" 36 msgstr ""
37 37
38 -#: src/objects/actions/save.c:166 src/objects/os/linux/savedesktopicon.c:233 38 +#: src/objects/actions/save.c:167 src/objects/os/linux/savedesktopicon.c:233
39 #: src/objects/os/windows/savedesktopicon.c:222 39 #: src/objects/os/windows/savedesktopicon.c:222
40 msgid "3270 session files" 40 msgid "3270 session files"
41 msgstr "" 41 msgstr ""
@@ -474,7 +474,7 @@ msgstr &quot;&quot; @@ -474,7 +474,7 @@ msgstr &quot;&quot;
474 msgid "Keypad width in columns" 474 msgid "Keypad width in columns"
475 msgstr "" 475 msgstr ""
476 476
477 -#: src/main/builder.c:118 477 +#: src/main/builder.c:135
478 msgid "Keypads" 478 msgid "Keypads"
479 msgstr "" 479 msgstr ""
480 480
@@ -709,7 +709,7 @@ msgstr &quot;&quot; @@ -709,7 +709,7 @@ msgstr &quot;&quot;
709 msgid "Save selected" 709 msgid "Save selected"
710 msgstr "" 710 msgstr ""
711 711
712 -#: src/objects/actions/save.c:75 src/objects/actions/save.c:163 712 +#: src/objects/actions/save.c:75 src/objects/actions/save.c:164
713 msgid "Save session preferences" 713 msgid "Save session preferences"
714 msgstr "" 714 msgstr ""
715 715
@@ -914,7 +914,7 @@ msgstr &quot;&quot; @@ -914,7 +914,7 @@ msgstr &quot;&quot;
914 msgid "TN3270 Session Files" 914 msgid "TN3270 Session Files"
915 msgstr "" 915 msgstr ""
916 916
917 -#: src/objects/window/keyfile.c:237 917 +#: src/objects/window/keyfile.c:241
918 msgid "TN3270 Session description" 918 msgid "TN3270 Session description"
919 msgstr "" 919 msgstr ""
920 920
@@ -1140,7 +1140,7 @@ msgstr &quot;&quot; @@ -1140,7 +1140,7 @@ msgstr &quot;&quot;
1140 msgid "_Apply" 1140 msgid "_Apply"
1141 msgstr "" 1141 msgstr ""
1142 1142
1143 -#: src/objects/actions/save.c:102 src/objects/settings/dialog.c:78 1143 +#: src/objects/actions/save.c:103 src/objects/settings/dialog.c:78
1144 #: src/objects/os/linux/savedesktopicon.c:140 1144 #: src/objects/os/linux/savedesktopicon.c:140
1145 #: src/objects/os/windows/savedesktopicon.c:132 1145 #: src/objects/os/windows/savedesktopicon.c:132
1146 msgid "_Cancel" 1146 msgid "_Cancel"
@@ -1191,7 +1191,7 @@ msgstr &quot;&quot; @@ -1191,7 +1191,7 @@ msgstr &quot;&quot;
1191 msgid "_Rename session" 1191 msgid "_Rename session"
1192 msgstr "" 1192 msgstr ""
1193 1193
1194 -#: src/objects/actions/save.c:103 src/objects/os/linux/savedesktopicon.c:141 1194 +#: src/objects/actions/save.c:104 src/objects/os/linux/savedesktopicon.c:141
1195 #: src/objects/os/windows/savedesktopicon.c:133 1195 #: src/objects/os/windows/savedesktopicon.c:133
1196 msgid "_Save" 1196 msgid "_Save"
1197 msgstr "" 1197 msgstr ""