Download as
Browse Code »

Commit 67ba171d88de65e88439cc0b58456c8d3a3e8c86

Authored by Perry Werneck
2 parents c602fceb e45129ac
Exists in master and in 1 other branch develop

Merge branch 'master' into develop

Showing 6 changed files with 72 additions and 118 deletions   Show diff stats
.github/workflows/codeql-analysis.yml
View file @c602fce
... ... @@ -1,93 +0,0 @@
1   -# For most projects, this workflow file will not need changing; you simply need
2   -# to commit it to your repository.
3   -#
4   -# You may wish to alter this file to override the set of languages analyzed,
5   -# or to provide custom queries or build logic.
6   -name: "CodeQL"
7   -
8   -on:
9   - push:
10   - branches: [master]
11   - pull_request:
12   - # The branches below must be a subset of the branches above
13   - branches: [master]
14   - schedule:
15   - - cron: '0 17 * * 0'
16   -
17   -jobs:
18   - analyze:
19   - name: Analyze
20   - runs-on: ubuntu-latest
21   -
22   - strategy:
23   - fail-fast: false
24   - matrix:
25   - # Override automatic language detection by changing the below list
26   - # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
27   - language: ['cpp']
28   - # Learn more...
29   - # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
30   -
31   - steps:
32   - - name: Checkout repository
33   - uses: actions/checkout@v2
34   - with:
35   - # We must fetch at least the immediate parents so that if this is
36   - # a pull request then we can checkout the head.
37   - fetch-depth: 2
38   -
39   - # If this run was triggered by a pull request event, then checkout
40   - # the head of the pull request instead of the merge commit.
41   - - run: git checkout HEAD^2
42   - if: ${{ github.event_name == 'pull_request' }}
43   -
44   - # Initializes the CodeQL tools for scanning.
45   - - name: Initialize CodeQL
46   - uses: github/codeql-action/init@v1
47   - with:
48   - languages: ${{ matrix.language }}
49   - # If you wish to specify custom queries, you can do so here or in a config file.
50   - # By default, queries listed here will override any specified in a config file.
51   - # Prefix the list here with "+" to use these queries and those in the config file.
52   - # queries: ./path/to/local/query, your-org/your-repo/queries@main
53   -
54   - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55   - # If this step fails, then you should remove it and run the build manually (see below)
56   - #- name: Autobuild
57   - # uses: github/codeql-action/autobuild@v1
58   -
59   - # ℹ️ Command-line programs to run using the OS shell.
60   - # 📚 https://git.io/JvXDl
61   -
62   - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63   - # and modify them (or add more) to build your code if your project
64   - # uses a compiled language
65   - - name: Install Dependencies
66   - run: |
67   - sudo apt update
68   - sudo apt-get -f install autotools-dev autoconf gettext libssl-dev libcurl4-openssl-dev libgtk-3-dev
69   - git clone https://github.com/PerryWerneck/lib3270.git ./lib3270
70   - NOCONFIGURE=1 ./lib3270/autogen.sh
71   - cd lib3270
72   - ./configure --prefix=/usr
73   - make all
74   - sudo make install
75   - cd ..
76   - sudo rm -fr lib3270
77   - git clone https://github.com/PerryWerneck/libv3270.git ./libv3270
78   - NOCONFIGURE=1 ./libv3270/autogen.sh
79   - cd libv3270
80   - ./configure --prefix=/usr
81   - make all
82   - sudo make install
83   - cd ..
84   - sudo rm -fr libv3270
85   -
86   -
87   - - name: build
88   - run: |
89   - ./autogen.sh
90   - make Release
91   -
92   - - name: Perform CodeQL Analysis
93   - uses: github/codeql-action/analyze@v1
.github/workflows/codeql.yml 0 → 100644
  Diff comments   View file @67ba171
... ... @@ -0,0 +1,44 @@
  1 +---
  2 +name: CodeQL
  3 +on:
  4 + push:
  5 + branches:
  6 + - master
  7 + pull_request:
  8 + branches:
  9 + - master
  10 + schedule:
  11 + - cron: 48 7 * * 1
  12 +jobs:
  13 + analyze:
  14 + name: Analyze
  15 + runs-on: ubuntu-22.04
  16 + permissions:
  17 + actions: read
  18 + contents: read
  19 + security-events: write
  20 + strategy:
  21 + fail-fast: false
  22 + matrix:
  23 + language:
  24 + - cpp
  25 + steps:
  26 + - name: Checkout
  27 + uses: actions/checkout@v3
  28 + - name: Install Packages
  29 + run: |
  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
  32 + sudo apt-get update
  33 + sudo apt-get install --yes git make autopoint gettext pkg-config libgtk-3-dev imagemagick lib3270-dev libv3270-dev
  34 + - name: Initialize CodeQL
  35 + uses: github/codeql-action/init@v2
  36 + with:
  37 + languages: ${{ matrix.language }}
  38 + queries: +security-and-quality
  39 + - name: Autobuild
  40 + uses: github/codeql-action/autobuild@v2
  41 + - name: Perform CodeQL Analysis
  42 + uses: github/codeql-action/analyze@v2
  43 + with:
  44 + category: /language:${{ matrix.language }}
... ...
Makefile.in
  Diff comments   View file @67ba171
... ... @@ -135,15 +135,6 @@ $(OBJDBG)/%.o: \
135 135 @$(MKDIR) $(@D)
136 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 138 #---[ Release Rules ]--------------------------------------------------------------------
148 139  
149 140 $(OBJRLS)/%.o: \
... ... @@ -251,12 +242,15 @@ install-%: \
251 242 $< \
252 243 $@
253 244  
254   -#---[ Release Targets ]------------------------------------------------------------------
  245 +#---[ Main Target ]----------------------------------------------------------------------
255 246  
256 247 all: \
257 248 $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \
258 249 locale
259 250  
  251 +
  252 +#---[ Release Targets ]------------------------------------------------------------------
  253 +
260 254 locale: \
261 255 locale/$(PACKAGE_NAME).pot
262 256  
... ... @@ -352,6 +346,15 @@ install-icons:
352 346  
353 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 358 locale/$(PACKAGE_NAME).pot: \
356 359 $(foreach SRC, $(basename $(COMMON_SOURCES)), $(POTDIR)/$(SRC).pot) \
357 360 $(foreach SRC, $(basename $(wildcard $(srcdir)/src/objects/os/linux/*.c)), $(POTDIR)/$(SRC).pot) \
... ...
README.md
  Diff comments   View file @67ba171
... ... @@ -121,7 +121,7 @@ Updated windows installers are available on Dropbox, google drive and one drive.
121 121 2. build
122 122  
123 123 ```shell
124   - jhbuild --moduleset=https://raw.githubusercontent.com/PerryWerneck/pw3270/macos/mac/pw3270.modules build pw3270
  124 + jhbuild --moduleset=https://raw.githubusercontent.com/PerryWerneck/pw3270/master/mac/pw3270.modules build pw3270
125 125 ```
126 126  
127 127  
... ...
locale/pt_BR.po
  Diff comments   View file @67ba171
... ... @@ -5,7 +5,7 @@ msgid &quot;&quot;
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 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 9 "PO-Revision-Date: 2021-12-23 01:36-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Brazilian Portuguese <perry.werneck@gmail.com>\n"
... ... @@ -37,7 +37,7 @@ msgstr &quot;Linux 32 bits&quot;
37 37 msgid "32 bits Windows"
38 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 41 #: src/objects/os/windows/savedesktopicon.c:222
42 42 msgid "3270 session files"
43 43 msgstr "Arquivos de sessão TN3270"
... ... @@ -478,7 +478,7 @@ msgstr &quot;Altura do painel em linhas&quot;
478 478 msgid "Keypad width in columns"
479 479 msgstr "Largura do painel em colunas"
480 480  
481   -#: src/main/builder.c:118
  481 +#: src/main/builder.c:135
482 482 msgid "Keypads"
483 483 msgstr "Painéis"
484 484  
... ... @@ -713,7 +713,7 @@ msgstr &quot;Salvar tela&quot;
713 713 msgid "Save selected"
714 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 717 msgid "Save session preferences"
718 718 msgstr "Salvar preferências da sessão"
719 719  
... ... @@ -918,7 +918,7 @@ msgstr &quot;Erro nas configurações de sistema&quot;
918 918 msgid "TN3270 Session Files"
919 919 msgstr "Arquivos de sessão TN3270"
920 920  
921   -#: src/objects/window/keyfile.c:237
  921 +#: src/objects/window/keyfile.c:241
922 922 msgid "TN3270 Session description"
923 923 msgstr "Descrição de sessão TN3270"
924 924  
... ... @@ -1148,7 +1148,7 @@ msgstr &quot;Atalhos windows&quot;
1148 1148 msgid "_Apply"
1149 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 1152 #: src/objects/os/linux/savedesktopicon.c:140
1153 1153 #: src/objects/os/windows/savedesktopicon.c:132
1154 1154 msgid "_Cancel"
... ... @@ -1199,7 +1199,7 @@ msgstr &quot;_Preferências&quot;
1199 1199 msgid "_Rename session"
1200 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 1203 #: src/objects/os/windows/savedesktopicon.c:133
1204 1204 msgid "_Save"
1205 1205 msgstr "_Salvar"
... ...
locale/pw3270.pot
  Diff comments   View file @67ba171
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 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 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -35,7 +35,7 @@ msgstr &quot;&quot;
35 35 msgid "32 bits Windows"
36 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 39 #: src/objects/os/windows/savedesktopicon.c:222
40 40 msgid "3270 session files"
41 41 msgstr ""
... ... @@ -474,7 +474,7 @@ msgstr &quot;&quot;
474 474 msgid "Keypad width in columns"
475 475 msgstr ""
476 476  
477   -#: src/main/builder.c:118
  477 +#: src/main/builder.c:135
478 478 msgid "Keypads"
479 479 msgstr ""
480 480  
... ... @@ -709,7 +709,7 @@ msgstr &quot;&quot;
709 709 msgid "Save selected"
710 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 713 msgid "Save session preferences"
714 714 msgstr ""
715 715  
... ... @@ -914,7 +914,7 @@ msgstr &quot;&quot;
914 914 msgid "TN3270 Session Files"
915 915 msgstr ""
916 916  
917   -#: src/objects/window/keyfile.c:237
  917 +#: src/objects/window/keyfile.c:241
918 918 msgid "TN3270 Session description"
919 919 msgstr ""
920 920  
... ... @@ -1140,7 +1140,7 @@ msgstr &quot;&quot;
1140 1140 msgid "_Apply"
1141 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 1144 #: src/objects/os/linux/savedesktopicon.c:140
1145 1145 #: src/objects/os/windows/savedesktopicon.c:132
1146 1146 msgid "_Cancel"
... ... @@ -1191,7 +1191,7 @@ msgstr &quot;&quot;
1191 1191 msgid "_Rename session"
1192 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 1195 #: src/objects/os/windows/savedesktopicon.c:133
1196 1196 msgid "_Save"
1197 1197 msgstr ""
... ...