Download as
Browse Code »

Commit d88253d0909785bf3e1b43da404f87c04e876377

Authored by perry.werneck@gmail.com
1 parent 6ea9ff12
Exists in master

Melhorando o bootstrap.sh

Showing 3 changed files with 44 additions and 36 deletions   Show diff stats
latest/bootstrap.sh
  Diff comments   View file @d88253d
@@ -5,48 +5,59 @@ PACKAGE_RELEASE=4 @@ -5,48 +5,59 @@ PACKAGE_RELEASE=4
5 REV_FILE=./revision.m4 5 REV_FILE=./revision.m4
6 REV=`date +%y%m%d%H%M` 6 REV=`date +%y%m%d%H%M`
7 7
8 -if test -d .svn ; then 8 +if test -d ".svn" ; then
  9 +
9 SVN=`which svn 2> /dev/null` 10 SVN=`which svn 2> /dev/null`
10 -else  
11 - SVN=""  
12 -fi  
13 11
14 -if ! test -x "$SVN" ; then 12 + if test -x "$SVN" ; then
15 13
16 - echo "Updating sources..."  
17 - "$SVN" update  
18 - if [ "$?" != "0" ]; then  
19 -  
20 - echo "$SVN update failed!" 14 + echo "Updating sources..."
  15 + "$SVN" update
  16 + if [ "$?" != "0" ]; then
21 17
22 - else 18 + echo "$SVN update failed!"
23 19
24 - if $SVN --xml info >/dev/null 2>&1; then  
25 - REV=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'`  
26 - LCD=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*<date>\([0-9\-]*\)\T\([0-9\:]*\)\..*<\/date>.*<\/commit>.*/\1 \2/'`  
27 - elif $SVN --version --quiet >/dev/null 2>&1; then  
28 - REV=`$SVN info | grep "^Revision:" | cut -d" " -f2`  
29 - LCD=`$SVN info | grep "^Last Changed Date:" | cut -d" " -f4,5`  
30 else 20 else
31 - LCD=""  
32 - fi  
33 21
34 - echo "m4_define([SVN_REV], $REV)" > $REV_FILE  
35 - echo "m4_define([SVN_DATE], $LCD)" >> $REV_FILE  
36 - echo "m4_define([SVN_RELEASE], $PACKAGE_RELEASE)" >> $REV_FILE 22 + if $SVN --xml info >/dev/null 2>&1; then
  23 + REV=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'`
  24 + LCD=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*<date>\([0-9\-]*\)\T\([0-9\:]*\)\..*<\/date>.*<\/commit>.*/\1 \2/'`
  25 + elif $SVN --version --quiet >/dev/null 2>&1; then
  26 + REV=`$SVN info | grep "^Revision:" | cut -d" " -f2`
  27 + LCD=`$SVN info | grep "^Last Changed Date:" | cut -d" " -f4,5`
  28 + else
  29 + LCD=""
  30 + fi
37 31
38 - fi 32 + if [ -z $LCD ]; then
  33 + LCD=`date +%Y%m%d`
  34 + fi
  35 +
  36 + echo "m4_define([SVN_REV], $REV)" > $REV_FILE
  37 + echo "m4_define([SVN_DATE], $LCD)" >> $REV_FILE
  38 + echo "m4_define([SVN_RELEASE], $PACKAGE_RELEASE)" >> $REV_FILE
39 39
40 - SVN2CL=`which svn2cl.sh 2> /dev/null`  
41 - if [ ! -z $SVN2CL ]; then  
42 - echo "Creating changelog ..."  
43 - $SVN2CL 40 + fi
  41 +
  42 + SVN2CL=`which svn2cl.sh 2> /dev/null`
  43 + if [ ! -z $SVN2CL ]; then
  44 + echo "Creating changelog ..."
  45 + $SVN2CL
  46 + fi
44 fi 47 fi
45 48
  49 +elif [ ! -e $REV_FILE ]; then
  50 + echo "Can´t find subversion and no revision.m4 supplied; aborting"
  51 + exit -1
  52 +fi
  53 +
  54 +if [ ! -f $REV_FILE ]; then
  55 + echo "Can't create $REV_FILE Is svn installed?"
  56 + exit -1
46 fi 57 fi
47 58
48 case $MACHTYPE in 59 case $MACHTYPE in
49 - 60 +
50 *-apple-*) 61 *-apple-*)
51 62
52 if [ -z $JHBUILD_PREFIX ]; then 63 if [ -z $JHBUILD_PREFIX ]; then
@@ -55,7 +66,7 @@ case $MACHTYPE in @@ -55,7 +66,7 @@ case $MACHTYPE in
55 fi 66 fi
56 67
57 ;; 68 ;;
58 - 69 +
59 *) 70 *)
60 SVN_SCRIPT="s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;s/@PACKAGE_RELEASE@/$PACKAGE_RELEASE/g;s/@PACKAGE_REVISION@/$REV/g;s/@DATE_CHANGED@/`date --rfc-2822`/g" 71 SVN_SCRIPT="s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;s/@PACKAGE_RELEASE@/$PACKAGE_RELEASE/g;s/@PACKAGE_REVISION@/$REV/g;s/@DATE_CHANGED@/`date --rfc-2822`/g"
61 72
@@ -67,7 +78,7 @@ case $MACHTYPE in @@ -67,7 +78,7 @@ case $MACHTYPE in
67 sed "$SVN_SCRIPT" "debian/changelog.in" > "debian/changelog" 78 sed "$SVN_SCRIPT" "debian/changelog.in" > "debian/changelog"
68 fi 79 fi
69 ;; 80 ;;
70 - 81 +
71 esac 82 esac
72 83
73 aclocal 84 aclocal
@@ -80,11 +91,6 @@ if [ &quot;$?&quot; != &quot;0&quot; ]; then @@ -80,11 +91,6 @@ if [ &quot;$?&quot; != &quot;0&quot; ]; then
80 exit -1 91 exit -1
81 fi 92 fi
82 93
83 -if [ ! -f $REV_FILE ]; then  
84 - echo "Can't create $REV_FILE Is svn installed?"  
85 - exit -1  
86 -fi  
87 -  
88 echo "pw3270 $PACKAGE_VERSION-$PACKAGE_RELEASE Ok" 94 echo "pw3270 $PACKAGE_VERSION-$PACKAGE_RELEASE Ok"
89 95
90 96
latest/pw3270.cbp
  Diff comments   View file @d88253d
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
35 <Add option="-Wall" /> 35 <Add option="-Wall" />
36 </Compiler> 36 </Compiler>
37 <Unit filename="Makefile.in" /> 37 <Unit filename="Makefile.in" />
  38 + <Unit filename="bootstrap.sh" />
38 <Unit filename="configure.ac" /> 39 <Unit filename="configure.ac" />
39 <Unit filename="debian\control.in"> 40 <Unit filename="debian\control.in">
40 <Option target="Release" /> 41 <Option target="Release" />
latest/src/lib/Makefile.in
  Diff comments   View file @d88253d
@@ -61,7 +61,8 @@ SSL_CFLAGS=@SSL_CFLAGS@ @@ -61,7 +61,8 @@ SSL_CFLAGS=@SSL_CFLAGS@
61 SSL_LIBS=@SSL_LIBS@ 61 SSL_LIBS=@SSL_LIBS@
62 62
63 SOCKET_LIBS=@SOCKET_LIBS@ 63 SOCKET_LIBS=@SOCKET_LIBS@
64 -SDK_LDFLAGS="-Wl,--warn-duplicate-exports,--output-def,$(basename $(@F)).def" 64 +SDK_LDFLAGS="--output-def,$(basename $(@F)).def"
  65 +# -Wl,--warn-duplicate-exports,
65 66
66 #---[ Sources ]---------------------------------------------------------------- 67 #---[ Sources ]----------------------------------------------------------------
67 68