Commit 224bbafc6f446545277814115b38d79e44aeb899
1 parent
e3849130
Exists in
master
Fixing bugs caused by updates on libipc3270.
Showing
4 changed files
with
28 additions
and
16 deletions
Show diff stats
configure.ac
| @@ -31,7 +31,7 @@ AC_PREREQ(2.61) | @@ -31,7 +31,7 @@ AC_PREREQ(2.61) | ||
| 31 | 31 | ||
| 32 | dnl Initialise automake with the package name, version and | 32 | dnl Initialise automake with the package name, version and |
| 33 | dnl bug-reporting address. | 33 | dnl bug-reporting address. |
| 34 | -AC_INIT([lib3270-mono-bindings], [5.2], [perry.werneck@gmail.com]) | 34 | +AC_INIT([mono-tn3270], [5.2], [perry.werneck@gmail.com]) |
| 35 | 35 | ||
| 36 | dnl Place auxilliary scripts here. | 36 | dnl Place auxilliary scripts here. |
| 37 | AC_CONFIG_AUX_DIR([scripts]) | 37 | AC_CONFIG_AUX_DIR([scripts]) |
| @@ -138,7 +138,7 @@ dnl --------------------------------------------------------------------------- | @@ -138,7 +138,7 @@ dnl --------------------------------------------------------------------------- | ||
| 138 | dnl Version info | 138 | dnl Version info |
| 139 | dnl --------------------------------------------------------------------------- | 139 | dnl --------------------------------------------------------------------------- |
| 140 | 140 | ||
| 141 | -AC_SUBST(PACKAGE_DESCRIPTION,".NET Bindings for lib3270/pw3270") | 141 | +AC_SUBST(PACKAGE_DESCRIPTION,"A .NET library for TN3270") |
| 142 | app_cv_zipname=$PACKAGE | 142 | app_cv_zipname=$PACKAGE |
| 143 | 143 | ||
| 144 | app_vrs_major=$(echo $VERSION | cut -d. -f1) | 144 | app_vrs_major=$(echo $VERSION | cut -d. -f1) |
gitsync.sh
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | # | 2 | # |
| 3 | # https://help.github.com/articles/syncing-a-fork/ | 3 | # https://help.github.com/articles/syncing-a-fork/ |
| 4 | +# | ||
| 4 | # https://help.github.com/articles/configuring-a-remote-for-a-fork/ | 5 | # https://help.github.com/articles/configuring-a-remote-for-a-fork/ |
| 6 | +# | ||
| 5 | # https://www.opentechguides.com/how-to/article/git/177/git-sync-repos.html | 7 | # https://www.opentechguides.com/how-to/article/git/177/git-sync-repos.html |
| 6 | # | 8 | # |
| 7 | # Setup: | 9 | # Setup: |
| 8 | # | 10 | # |
| 9 | -# git remote add --mirror=fetch secondary https://secondary_repo_url/secondary_repo.git | ||
| 10 | -# git fetch origin | ||
| 11 | -# git push secondary --all | 11 | +# git remote add github https://github.com/PerryWerneck/lib3270.git |
| 12 | # | 12 | # |
| 13 | # | 13 | # |
| 14 | 14 | ||
| 15 | git push | 15 | git push |
| 16 | 16 | ||
| 17 | git fetch origin | 17 | git fetch origin |
| 18 | -git checkout master | ||
| 19 | -git merge origin/master | 18 | +git merge |
| 20 | 19 | ||
| 21 | -for repo in $(git remote -v | grep -v origin | grep "(push)" | awk '{print $1}') | 20 | +REPOS=$(git remote -v | grep -v origin | grep "(push)" | awk '{print $1}') |
| 21 | + | ||
| 22 | +for repo in ${REPOS} | ||
| 23 | +do | ||
| 24 | + echo "Getting updates from ${repo} ..." | ||
| 25 | + git fetch ${repo} | ||
| 26 | + git merge | ||
| 27 | +done | ||
| 28 | + | ||
| 29 | +for repo in ${REPOS} | ||
| 22 | do | 30 | do |
| 23 | echo "Updating ${repo} ..." | 31 | echo "Updating ${repo} ..." |
| 24 | git push ${repo} | 32 | git push ${repo} |
| 25 | done | 33 | done |
| 26 | 34 | ||
| 27 | - |
pw3270-sharp.cbp
| @@ -43,14 +43,19 @@ | @@ -43,14 +43,19 @@ | ||
| 43 | <Linker> | 43 | <Linker> |
| 44 | <Add library="pw3270cpp" /> | 44 | <Add library="pw3270cpp" /> |
| 45 | </Linker> | 45 | </Linker> |
| 46 | + <Unit filename="src/include/config.h" /> | ||
| 46 | <Unit filename="src/include/config.h.in" /> | 47 | <Unit filename="src/include/config.h.in" /> |
| 47 | - <Unit filename="src/native/actions.cc" /> | ||
| 48 | - <Unit filename="src/native/get.cc" /> | ||
| 49 | - <Unit filename="src/native/init.cc" /> | ||
| 50 | - <Unit filename="src/native/network.cc" /> | 48 | + <Unit filename="src/include/native.h" /> |
| 49 | + <Unit filename="src/native/core/actions.cc" /> | ||
| 50 | + <Unit filename="src/native/core/get.cc" /> | ||
| 51 | + <Unit filename="src/native/core/init.cc" /> | ||
| 52 | + <Unit filename="src/native/core/network.cc" /> | ||
| 53 | + <Unit filename="src/native/core/screen.cc" /> | ||
| 54 | + <Unit filename="src/native/core/set.cc" /> | ||
| 55 | + <Unit filename="src/native/core/tools.cc" /> | ||
| 51 | <Unit filename="src/native/private.h" /> | 56 | <Unit filename="src/native/private.h" /> |
| 52 | - <Unit filename="src/native/screen.cc" /> | ||
| 53 | - <Unit filename="src/native/set.cc" /> | 57 | + <Unit filename="src/native/testprogram/testprogram.cc" /> |
| 58 | + <Unit filename="src/native/windows/resources.rc" /> | ||
| 54 | <Unit filename="src/pw3270-sharp/pw3270-sharp.cs" /> | 59 | <Unit filename="src/pw3270-sharp/pw3270-sharp.cs" /> |
| 55 | <Unit filename="testprograms/sample.cs" /> | 60 | <Unit filename="testprograms/sample.cs" /> |
| 56 | <Extensions> | 61 | <Extensions> |
src/native/core/actions.cc
| @@ -70,7 +70,7 @@ | @@ -70,7 +70,7 @@ | ||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | 72 | ||
| 73 | -static int action(TN3270::Host *ses, TN3270::Action id) noexcept { | 73 | +static int action(TN3270::Host *ses, TN3270::KeyboardAction id) noexcept { |
| 74 | 74 | ||
| 75 | return action(ses, [id](TN3270::Host &ses) { | 75 | return action(ses, [id](TN3270::Host &ses) { |
| 76 | ses.push(id); | 76 | ses.push(id); |