Download as
Browse Code »

Commit 193c879083d998c31f2cca0e03e1865dae383cea

Authored by Perry Werneck
1 parent df4b0bdd
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Incluindo lib3270 como sub módulo.

Showing 5 changed files with 18 additions and 37 deletions   Show diff stats
@@ -46,3 +46,4 @@ SPECS @@ -46,3 +46,4 @@ SPECS
46 SRPMS 46 SRPMS
47 resources.rc 47 resources.rc
48 makeruntime.sh 48 makeruntime.sh
  49 +scripts
.gitmodules 0 → 100644
  Diff comments   View file @193c879
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +[submodule "submodules/lib3270"]
  2 + path = submodules/lib3270
  3 + url = http://softwarepublico.gov.br/gitlab/pw3270/lib3270.git
@@ -5,7 +5,6 @@ APPLEVEL="0" @@ -5,7 +5,6 @@ APPLEVEL="0"
5 test -n "$srcdir" || srcdir=`dirname "$0"` 5 test -n "$srcdir" || srcdir=`dirname "$0"`
6 test -n "$srcdir" || srcdir=. 6 test -n "$srcdir" || srcdir=.
7 7
8 -olddir=`pwd`  
9 cd "$srcdir" 8 cd "$srcdir"
10 9
11 if test -e revision ; then 10 if test -e revision ; then
@@ -14,43 +13,14 @@ fi @@ -14,43 +13,14 @@ fi
14 13
15 touch ChangeLog 14 touch ChangeLog
16 15
17 -# Inicia com os defaults  
18 -TEMPFILE=autogen.tmp 16 +# Obtém revisão via git
  17 +# Referência: http://stackoverflow.com/questions/4120001/what-is-the-git-equivalent-for-revision-number
19 18
20 -if [ -d .svn ]; then 19 +# Obtém URL via git
  20 +PACKAGE_SOURCE=$(git config --get remote.origin.url)
21 21
22 - # Tenta detectar a versão  
23 - SVNVERSION=$(which svnversion 2> /dev/null)  
24 - if test -x "${SVNVERSION}" ; then  
25 - svnversion | cut -d: -f2 | sed 's@[M|m]@@g' > ${TEMPFILE} 2> /dev/null  
26 - if [ "$?" == "0" ]; then  
27 - PACKAGE_REVISION=$(cat ${TEMPFILE})  
28 - fi  
29 - fi  
30 -  
31 - # Tenta detectar a URL  
32 - SVN=$(which svn 2> /dev/null)  
33 - if test -x "${SVN}" ; then  
34 -  
35 - LANG="EN_US" "${SVN}" info > ${TEMPFILE} 2>&1  
36 - if [ "$?" == "0" ]; then  
37 - PACKAGE_SOURCE=$(cat ${TEMPFILE} | grep "^URL: " | cut -d" " -f2)  
38 - fi  
39 -  
40 - fi  
41 -  
42 -elif [ -d .git ]; then  
43 -  
44 - # Obtém revisão via git  
45 - # Referência: http://stackoverflow.com/questions/4120001/what-is-the-git-equivalent-for-revision-number  
46 -  
47 - # Obtém URL via git  
48 - PACKAGE_SOURCE=$(git config --get remote.origin.url)  
49 -  
50 - # Obtém número total de commits  
51 - PACKAGE_REVISION=$(git rev-list HEAD --count)  
52 -  
53 -fi 22 +# Obtém número total de commits
  23 +PACKAGE_REVISION=$(git rev-list HEAD --count)
54 24
55 if test -z $PACKAGE_REVISION ; then 25 if test -z $PACKAGE_REVISION ; then
56 echo "Can´t detect package revision, using current date" 26 echo "Can´t detect package revision, using current date"
@@ -70,6 +40,9 @@ echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $srcdir/revision.m4 @@ -70,6 +40,9 @@ echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $srcdir/revision.m4
70 echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $srcdir/revision.m4 40 echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $srcdir/revision.m4
71 echo "m4_define([APP_LEVEL], $APPLEVEL)" >> $srcdir/revision.m4 41 echo "m4_define([APP_LEVEL], $APPLEVEL)" >> $srcdir/revision.m4
72 42
  43 +mkdir -p scripts
  44 +automake --add-missing 2> /dev/null | true
  45 +
73 aclocal 46 aclocal
74 if test $? != 0 ; then 47 if test $? != 0 ; then
75 echo "aclocal failed." 48 echo "aclocal failed."
@@ -82,6 +55,8 @@ if test $? != 0 ; then @@ -82,6 +55,8 @@ if test $? != 0 ; then
82 exit -1 55 exit -1
83 fi 56 fi
84 57
  58 +NOCONFIGURE=1 ./submodules/lib3270/autogen.sh
  59 +
85 echo "Package set to revision $PACKAGE_REVISION and source $PACKAGE_SOURCE" 60 echo "Package set to revision $PACKAGE_REVISION and source $PACKAGE_SOURCE"
86 61
87 cd "$olddir" 62 cd "$olddir"
@@ -34,10 +34,11 @@ AC_PREREQ(2.61) @@ -34,10 +34,11 @@ AC_PREREQ(2.61)
34 34
35 dnl Initialise automake with the package name, version and 35 dnl Initialise automake with the package name, version and
36 dnl bug-reporting address. 36 dnl bug-reporting address.
37 -AC_INIT([pw3270], [5.1], [perry.werneck@gmail.com]) 37 +AC_INIT([pw3270], [5.2], [perry.werneck@gmail.com])
38 38
39 dnl Place auxilliary scripts here. 39 dnl Place auxilliary scripts here.
40 AC_CONFIG_AUX_DIR([scripts]) 40 AC_CONFIG_AUX_DIR([scripts])
  41 +AC_CONFIG_SUBDIRS([submodules/lib3270])
41 42
42 dnl Compute the canonical host-system type 43 dnl Compute the canonical host-system type
43 AC_CANONICAL_HOST 44 AC_CANONICAL_HOST
submodules/lib3270 0 → 160000
  Diff comments   View file @193c879
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +Subproject commit 4aa7a83f3e7228c43c71860321a515dbf13cb631