Download as
Browse Code »

Commit 4681ffa3ce786c7b374bd3106a16f8bbb45cf4ab

Authored by Perry Werneck
Committed by GitHub
2 parents 43161148 2bdd8830
Exists in develop

Merge pull request #30 from PerryWerneck/develop 

Updating package control files.
Showing 5 changed files with 7 additions and 226 deletions   Show diff stats
.github/workflows/publish.yml
  Diff comments   View file @4681ffa
... ... @@ -27,7 +27,7 @@ jobs:
27 27 with:
28 28 repository: "PerryWerneck/lib3270"
29 29 latest: true
30   - fileName: "mingw-lib3270.tar.xz"
  30 + fileName: "mingw-lib3270.x86_64.tar.xz"
31 31 - name: CI-Build
32 32 run: |
33 33 ./win/ci-build.sh
... ...
rpm/_service
  Diff comments   View file @4681ffa
... ... @@ -8,69 +8,11 @@
8 8 <param name="changesgenerate">enable</param>
9 9 <param name="changesauthor">perry.werneck@gmail.com</param>
10 10  
11   - <param name="versionformat">@PARENT_TAG@</param>
  11 + <param name="versionformat">@PARENT_TAG@+git%cd</param>
12 12 <param name="scm">git</param>
13 13  
14 14 </service>
15 15  
16   - <!-- https://github.com/openSUSE/obs-service-extract_file -->
17   - <!-- service name="extract_file">
18   - <param name="archive">*.tar</param>
19   - <param name="files">*/rpm/libv3270.spec</param>
20   - </service -->
21   -
22   - <!-- service name="extract_file">
23   - <param name="archive">*.tar</param>
24   - <param name="files">*/arch/PKGBUILD</param>
25   - </service -->
26   -
27   - <service name="extract_file">
28   - <param name="archive">*.tar</param>
29   - <param name="files">*/debian/changelog</param>
30   - <param name="outfilename">debian.changelog</param>
31   - </service>
32   -
33   - <service name="extract_file">
34   - <param name="archive">*.tar</param>
35   - <param name="files">*/debian/*.dsc</param>
36   - </service>
37   -
38   - <service name="extract_file">
39   - <param name="archive">*.tar</param>
40   - <param name="files">*/debian/control</param>
41   - <param name="outfilename">debian.control</param>
42   - </service>
43   -
44   - <!-- service name="extract_file">
45   - <param name="archive">*.tar</param>
46   - <param name="files">*/debian/rules</param>
47   - <param name="outfilename">debian.rules</param>
48   - </service -->
49   -
50   - <service name="extract_file">
51   - <param name="archive">*.tar</param>
52   - <param name="files">*/debian/compat</param>
53   - <param name="outfilename">debian.compat</param>
54   - </service>
55   -
56   - <service name="extract_file">
57   - <param name="archive">*.tar</param>
58   - <param name="files">*/debian/shlibs</param>
59   - <param name="outfilename">debian.shlibs</param>
60   - </service>
61   -
62   - <service name="extract_file">
63   - <param name="archive">*.tar</param>
64   - <param name="files">*/debian/postinst</param>
65   - <param name="outfilename">debian.postinst</param>
66   - </service>
67   -
68   - <service name="extract_file">
69   - <param name="archive">*.tar</param>
70   - <param name="files">*/debian/postrm</param>
71   - <param name="outfilename">debian.postrm</param>
72   - </service>
73   -
74 16 <service name="recompress">
75 17 <param name="file">*.tar</param>
76 18 <param name="compression">xz</param>
... ...
win/ci-build.sh
  Diff comments   View file @4681ffa
... ... @@ -23,27 +23,13 @@ cd ${myDIR}
23 23 rm -fr ${myDIR}/.build
24 24  
25 25 #
26   -# Build LIB3270
  26 +# Unpack lib3270
27 27 #
28   -if [ -e mingw-lib3270.tar.xz ]; then
29   -
30   - echo "Unpacking lib3270"
31   - tar -C / -Jxvf mingw-lib3270.tar.xz
32   -
33   -else
34   - echo "Building lib3270"
35   - git clone https://github.com/PerryWerneck/lib3270.git ./.build/lib3270 || die "clone lib3270 failure"
36   - cd ./.build/lib3270
37   - ./autogen.sh || die "Lib3270 autogen failure"
38   - ./configure || die "Lib3270 Configure failure"
39   - make clean || die "Lib3270 Make clean failure"
40   - make all || die "Lib3270 Make failure"
41   - make install || die "Lib3270 Install failure"
42   - cd ../..
43   -fi
  28 +echo "Unpacking lib3270"
  29 +tar -C / -Jxf mingw-lib3270.${MSYSTEM_CARCH}.tar.xz > $LOGFILE 2>&1 || die "lib3270 unpack failure"
44 30  
45 31 #
46   -# Build PW3270
  32 +# Build libv3270
47 33 #
48 34 echo "Building libv3270"
49 35 cd ${myDIR}
... ... @@ -53,7 +39,7 @@ make clean &gt; $LOGFILE 2&gt;&amp;1 || die &quot;Make clean failure&quot;
53 39 make all > $LOGFILE 2>&1 || die "Make failure"
54 40  
55 41 make DESTDIR=.bin/package install || die "Install failure"
56   -tar --create --xz --file=mingw-libv3270.tar.xz --directory=.bin/package --verbose . || die "Tar failure"
  42 +tar --create --xz --file=mingw-libv3270.${MSYSTEM_CARCH}.tar.xz --directory=.bin/package --verbose . || die "Tar failure"
57 43  
58 44  
59 45 echo "Build complete"
... ...
win/configure.sh
View file @4316114
... ... @@ -1,70 +0,0 @@
1   -#!/bin/bash
2   -cd $(dirname $(dirname $(readlink -f ${0})))
3   -
4   -aclocal
5   -if test $? != 0 ; then
6   - echo "aclocal failed."
7   - exit -1
8   -fi
9   -
10   -autoconf
11   -if test $? != 0 ; then
12   - echo "autoconf failed."
13   - exit -1
14   -fi
15   -
16   -mkdir -p scripts
17   -automake --add-missing 2> /dev/null | true
18   -
19   -export HOST_CC=/usr/bin/gcc
20   -
21   -until [ -z "${1}" ]
22   -do
23   - if [ ${1:0:2} = '--' ]; then
24   - tmp=${1:2}
25   - parameter=${tmp%%=*}
26   - parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]")
27   -
28   - case $parameter in
29   -
30   - 32)
31   - rm -f win32.cache
32   - ./configure \
33   - --cache-file=win32.cache \
34   - --host=i686-w64-mingw32 \
35   - --prefix=/usr/i686-w64-mingw32/sys-root/mingw \
36   - --libdir=/usr/i686-w64-mingw32/sys-root/mingw/lib
37   -
38   - exit $?
39   - ;;
40   -
41   - 64)
42   - rm -f win64.cache
43   - ./configure \
44   - --cache-file=win64.cache \
45   - --host=x86_64-w64-mingw32 \
46   - --prefix=/usr/x86_64-w64-mingw32/sys-root/mingw \
47   - --libdir=/usr/x86_64-w64-mingw32/sys-root/mingw/lib
48   - exit $?
49   - ;;
50   -
51   - ALL)
52   - ;;
53   -
54   -
55   - *)
56   - value=${tmp##*=}
57   - eval $parameter=$value
58   - esac
59   -
60   - fi
61   -
62   - shift
63   -done
64   -
65   -echo "Execute:"
66   -echo " ${0} --32 for 32 bits windows."
67   -echo " ${0} --64 for 64 bits windows."
68   -
69   -exit -1
70   -
win/install-cross.sh
View file @4316114
... ... @@ -1,77 +0,0 @@
1   -#!/bin/bash
2   -myDIR=$(dirname $(readlink -f ${0}))
3   -
4   -install_packages() {
5   -
6   - TEMPFILE=$(mktemp)
7   -
8   - for spec in $(find ${myDIR} -name "${1}*.spec")
9   - do
10   - echo "Parsing ${spec}"
11   - grep -i "^Requires:" "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' | cut -d'>' -f1 >> ${TEMPFILE}
12   - grep -i "^BuildRequires:" "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' | cut -d'>' -f1 >> ${TEMPFILE}
13   - done
14   -
15   - cat ${TEMPFILE} \
16   - | sort --unique \
17   - | xargs sudo zypper --non-interactive --verbose in
18   -
19   - rm -f ${TEMPFILE}
20   -
21   -}
22   -
23   -if [ -z ${1} ]; then
24   - echo "${0} [options]"
25   - echo ""
26   - echo "Options:"
27   - echo ""
28   -
29   - echo " --ar Install required OBS repositories for zypper"
30   - echo " --32 Install cross compiler for 32 bits windows using zypper"
31   - echo " --64 Install cross compiler for 64 bits windows using zypper"
32   - echo " --all Install cross compiler for 32 and 64 bits windows using zypper"
33   - exit -1
34   -fi
35   -
36   -
37   -until [ -z "${1}" ]
38   -do
39   - if [ ${1:0:2} = '--' ]; then
40   - tmp=${1:2}
41   - parameter=${tmp%%=*}
42   - parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]")
43   -
44   - case $parameter in
45   -
46   - AR)
47   - echo "Adding required repositories"
48   - sudo zypper ar obs://windows:mingw:win32 windows_mingw_win32
49   - sudo zypper ar obs://windows:mingw:win64 windows_mingw_win64
50   - sudo zypper ar obs://home:PerryWerneck:pw3270 home_PerryWerneck_pw3270
51   - ;;
52   -
53   - 32)
54   - install_packages mingw32
55   - ;;
56   -
57   - 64)
58   - install_packages mingw64
59   - ;;
60   -
61   - ALL)
62   - install_packages mingw32
63   - install_packages mingw64
64   - ;;
65   -
66   -
67   - *)
68   - value=${tmp##*=}
69   - eval $parameter=$value
70   - esac
71   -
72   - fi
73   -
74   - shift
75   -done
76   -
77   -