Download as
Browse Code »

Commit 7c8537fe839b956e0547a04090d9db73a8794147

Authored by Perry Werneck
Committed by GitHub
2 parents 0fafa953 a75d4e5f
Exists in develop

Merge pull request #52 from PerryWerneck/develop 

Fixing default schema values.
Showing 5 changed files with 45 additions and 32 deletions   Show diff stats
.github/workflows/msys2.yml
  Diff comments   View file @7c8537f
@@ -3,23 +3,41 @@ on: @@ -3,23 +3,41 @@ on:
3 pull_request: 3 pull_request:
4 branches: 4 branches:
5 - master 5 - master
6 - schedule:  
7 - - cron: '30 13 3 2,4,6,8,10,12 *' 6 + push:
  7 + branches:
  8 + - develop
8 9
9 jobs: 10 jobs:
10 msys2-mingw: 11 msys2-mingw:
  12 + name: Publish Windows 64
11 runs-on: windows-latest 13 runs-on: windows-latest
12 defaults: 14 defaults:
13 run: 15 run:
14 shell: msys2 {0} 16 shell: msys2 {0}
15 steps: 17 steps:
16 - uses: actions/checkout@v3 18 - uses: actions/checkout@v3
  19 + - uses: oprypin/find-latest-tag@v1
  20 + id: gettag
  21 + with:
  22 + repository: PerryWerneck/libv3270
  23 + releases-only: true
17 - uses: msys2/setup-msys2@v2 24 - uses: msys2/setup-msys2@v2
18 with: 25 with:
19 msystem: mingw64 26 msystem: mingw64
20 update: true 27 update: true
21 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape 28 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape
  29 + - uses: robinraju/release-downloader@v1.7
  30 + with:
  31 + repository: "PerryWerneck/lib3270"
  32 + latest: true
  33 + fileName: "mingw-lib3270.x86_64.tar.xz"
  34 + - uses: robinraju/release-downloader@v1.7
  35 + with:
  36 + repository: "PerryWerneck/libv3270"
  37 + latest: true
  38 + fileName: "mingw-libv3270.x86_64.tar.xz"
22 - name: CI-Build 39 - name: CI-Build
23 run: | 40 run: |
24 ./win/ci-build.sh 41 ./win/ci-build.sh
25 42
  43 +
@@ -74,7 +74,6 @@ case "$host" in @@ -74,7 +74,6 @@ case "$host" in
74 AC_CONFIG_FILES(src/main/windows/resources.rc) 74 AC_CONFIG_FILES(src/main/windows/resources.rc)
75 AC_CONFIG_FILES(src/main/windows/app-manifest.xml) 75 AC_CONFIG_FILES(src/main/windows/app-manifest.xml)
76 76
77 - # Windows and linux doesn't use the same defaults.  
78 AC_CONFIG_FILES(win/makeruntime.sh) 77 AC_CONFIG_FILES(win/makeruntime.sh)
79 AC_CONFIG_FILES(win/pw3270.nsi) 78 AC_CONFIG_FILES(win/pw3270.nsi)
80 79
@@ -91,7 +90,10 @@ case "$host" in @@ -91,7 +90,10 @@ case "$host" in
91 AC_SUBST(PROGRAMFILES,$app_cv_programfiles) 90 AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
92 AC_SUBST(WINARCH,$app_cv_winarch) 91 AC_SUBST(WINARCH,$app_cv_winarch)
93 AC_SUBST(NSISREDIR,$app_cv_nsisredir) 92 AC_SUBST(NSISREDIR,$app_cv_nsisredir)
  93 +
  94 + # Windows and unix doesn't use the same defaults.
94 AC_SUBST(DEFAULT_UI_STYLE,0) 95 AC_SUBST(DEFAULT_UI_STYLE,0)
  96 + AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"true")
95 ;; 97 ;;
96 98
97 *-apple-darwin*) 99 *-apple-darwin*)
@@ -100,16 +102,22 @@ case "$host" in @@ -100,16 +102,22 @@ case "$host" in
100 102
101 CFLAGS="$CFLAGS -pthread" 103 CFLAGS="$CFLAGS -pthread"
102 LDFLAGS="$LDFLAGS -pthread" 104 LDFLAGS="$LDFLAGS -pthread"
103 - AC_SUBST(DEFAULT_UI_STYLE,0) 105 +
  106 + # Windows and unix doesn't use the same defaults.
  107 + AC_SUBST(DEFAULT_UI_STYLE,1)
  108 + AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false")
104 ;; 109 ;;
105 110
106 *) 111 *)
107 app_cv_osname="linux" 112 app_cv_osname="linux"
108 app_rls_ldflags="" 113 app_rls_ldflags=""
109 114
110 - CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir)" 115 + CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir) -DDATADIR=\$(datadir)"
111 LDFLAGS="$LDFLAGS -pthread" 116 LDFLAGS="$LDFLAGS -pthread"
112 - AC_SUBST(DEFAULT_UI_STYLE,0) 117 +
  118 + # Windows and unix doesn't use the same defaults.
  119 + AC_SUBST(DEFAULT_UI_STYLE,1)
  120 + AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false")
113 121
114 esac 122 esac
115 123
@@ -139,7 +147,6 @@ dnl --------------------------------------------------------------------------- @@ -139,7 +147,6 @@ dnl ---------------------------------------------------------------------------
139 147
140 AC_PATH_TOOL([AR], [ar], [ar]) 148 AC_PATH_TOOL([AR], [ar], [ar])
141 AC_PATH_TOOL([CONVERT], [convert], [no]) 149 AC_PATH_TOOL([CONVERT], [convert], [no])
142 -AC_PATH_TOOL([OPTIPNG],[optipng],[no])  
143 AC_PATH_TOOL([ZIP],[zip],[no]) 150 AC_PATH_TOOL([ZIP],[zip],[no])
144 AC_PATH_TOOL([DLLTOOL],[dlltool],[no]) 151 AC_PATH_TOOL([DLLTOOL],[dlltool],[no])
145 AC_PATH_TOOL([WINDRES], [windres], [no]) 152 AC_PATH_TOOL([WINDRES], [windres], [no])
@@ -158,6 +165,8 @@ AC_PATH_TOOL([STRIP], [strip], [true]) @@ -158,6 +165,8 @@ AC_PATH_TOOL([STRIP], [strip], [true])
158 AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no]) 165 AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no])
159 AC_PATH_TOOL([GLIB_SCHEMA_COMPILER],[glib-compile-schemas],[false]) 166 AC_PATH_TOOL([GLIB_SCHEMA_COMPILER],[glib-compile-schemas],[false])
160 167
  168 +AC_PATH_TOOL([OPTIPNG], [optipng], [true])
  169 +
161 PKG_CHECK_EXISTS 170 PKG_CHECK_EXISTS
162 171
163 dnl --------------------------------------------------------------------------- 172 dnl ---------------------------------------------------------------------------
schemas/window.gschema.xml.in
  Diff comments   View file @7c8537f
@@ -55,13 +55,13 @@ @@ -55,13 +55,13 @@
55 </key> 55 </key>
56 56
57 <key name="toolbar-visible" type="b"> 57 <key name="toolbar-visible" type="b">
58 - <default>false</default> 58 + <default>true</default>
59 <summary>The toolbar visible state</summary> 59 <summary>The toolbar visible state</summary>
60 <description></description> 60 <description></description>
61 </key> 61 </key>
62 62
63 <key name="menubar-visible" type="b"> 63 <key name="menubar-visible" type="b">
64 - <default>false</default> 64 + <default>@DEFAULT_MENUBAR_VISIBLE@</default>
65 <summary>The menubar visible state</summary> 65 <summary>The menubar visible state</summary>
66 <description></description> 66 <description></description>
67 </key> 67 </key>
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 98
99 <key name="toolbar-action-names" type="s"> 99 <key name="toolbar-action-names" type="s">
100 <default>'win.copy,win.paste,win.select-all,separator,win.clear,win.erase-input,separator,win.print,separator,win.zoom-out,win.zoom-fit-best,win.zoom-in'</default> 100 <default>'win.copy,win.paste,win.select-all,separator,win.clear,win.erase-input,separator,win.print,separator,win.zoom-out,win.zoom-fit-best,win.zoom-in'</default>
101 - <summary>The toolbar action list</summary> 101 + <summary>The actions on the toolbar</summary>
102 <description></description> 102 <description></description>
103 </key> 103 </key>
104 104
src/objects/actions/view.c
  Diff comments   View file @7c8537f
@@ -195,7 +195,6 @@ static GSList * append_action(GSList * list, const gchar *prefix, GAction *actio @@ -195,7 +195,6 @@ static GSList * append_action(GSList * list, const gchar *prefix, GAction *actio
195 195
196 GdkPixbuf * pixbuf = g_action_get_pixbuf(action, GTK_ICON_SIZE_MENU, GTK_ICON_LOOKUP_GENERIC_FALLBACK); 196 GdkPixbuf * pixbuf = g_action_get_pixbuf(action, GTK_ICON_SIZE_MENU, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
197 if(!pixbuf) { 197 if(!pixbuf) {
198 - debug("Action \"%s\": Doesn't have a pixbuf",g_action_get_name(action));  
199 return list; 198 return list;
200 } 199 }
201 200
win/ci-build.sh
  Diff comments   View file @7c8537f
@@ -23,32 +23,16 @@ cd ${myDIR} @@ -23,32 +23,16 @@ cd ${myDIR}
23 rm -fr ${myDIR}/.build 23 rm -fr ${myDIR}/.build
24 24
25 # 25 #
26 -# Build LIB3270 26 +# Unpack LIB3270
27 # 27 #
28 -echo "Building lib3270"  
29 -mkdir -p ${myDIR}/.build/lib3270  
30 -git clone https://github.com/PerryWerneck/lib3270.git ${myDIR}/.build/lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure"  
31 -pushd ${myDIR}/.build/lib3270  
32 -./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"  
33 -./configure > $LOGFILE 2>&1 || die "Configure failure"  
34 -make clean > $LOGFILE 2>&1 || die "Make clean failure"  
35 -make all > $LOGFILE 2>&1 || die "Make failure"  
36 -make install > $LOGFILE 2>&1 || die "Install failure"  
37 -popd 28 +echo "Unpacking lib3270"
  29 +tar -C / -Jxf mingw-lib3270.${MSYSTEM_CARCH}.tar.xz > $LOGFILE 2>&1 || die "Unpack lib3270 failure"
38 30
39 # 31 #
40 # Build LIBV3270 32 # Build LIBV3270
41 # 33 #
42 -echo "Building libv3270"  
43 -mkdir -p ${myDIR}/.build/libv3270  
44 -git clone https://github.com/PerryWerneck/libv3270.git ${myDIR}/.build/libv3270 > $LOGFILE 2>&1 || die "clone libv3270 failure"  
45 -pushd ${myDIR}/.build/libv3270  
46 -./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"  
47 -./configure > $LOGFILE 2>&1 || die "Configure failure"  
48 -make clean > $LOGFILE 2>&1 || die "Make clean failure"  
49 -make all > $LOGFILE 2>&1 || die "Make failure"  
50 -make install > $LOGFILE 2>&1 || die "Install failure"  
51 -popd 34 +echo "Unpacking libv3270"
  35 +tar -C / -Jxf mingw-libv3270.tar.xz > $LOGFILE 2>&1 || die "Unpack libv3270 failure"
52 36
53 # 37 #
54 # Build PW3270 38 # Build PW3270
@@ -60,5 +44,8 @@ cd ${myDIR} @@ -60,5 +44,8 @@ cd ${myDIR}
60 make clean > $LOGFILE 2>&1 || die "Make clean failure" 44 make clean > $LOGFILE 2>&1 || die "Make clean failure"
61 make all > $LOGFILE 2>&1 || die "Make failure" 45 make all > $LOGFILE 2>&1 || die "Make failure"
62 46
  47 +make DESTDIR=.bin/package install
  48 +tar --create --xz --file=mingw-pw3270.${MSYSTEM_CARCH}.tar.xz --directory=.bin/package --verbose .
  49 +
63 echo "Build complete" 50 echo "Build complete"
64 51