Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Rmys
2020-01-25 13:51:40 +03:00
11 changed files with 207125 additions and 206989 deletions
+1 -1
View File
@@ -56,7 +56,7 @@
<History> <History>
<Update release="7"> <Update release="7">
<Date>20120-01-19</Date> <Date>2020-01-19</Date>
<Version>0.20.0</Version> <Version>0.20.0</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>İdris Kalp</Name> <Name>İdris Kalp</Name>
+28 -4
View File
@@ -4,18 +4,26 @@
# Licensed under the GNU General Public License, version 3. # Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt # See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import pythonmodules from pisi.actionsapi import pythonmodules
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get from pisi.actionsapi import get
WorkDir="%s" % get.srcDIR()
def setup(): def setup():
# create a folder for python3 build
shelltools.copy("python/", "python3/")
# suppress compiler warnings
pisitools.cxxflags.add("-Wno-stringop-overflow -Wno-unused-function -Wno-deprecated-declarations")
shelltools.export("PTHREAD_LIBS", "-lpthread") shelltools.export("PTHREAD_LIBS", "-lpthread")
shelltools.copy("../googletest-release-1.8.0", "gtest") shelltools.system("./autogen.sh")
autotools.autoreconf("-vif") autotools.autoreconf("-vif")
autotools.configure("--disable-static") autotools.configure("--disable-static")
# fix unused direct dependency analysis
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build(): def build():
@@ -23,14 +31,30 @@ def build():
shelltools.cd("python") shelltools.cd("python")
pythonmodules.compile() pythonmodules.compile()
shelltools.cd("..") shelltools.cd("..")
shelltools.cd("python3")
pythonmodules.compile(pyVer="3")
shelltools.cd("..")
# tests successfully completed but takes to much time!
#def check():
# autotools.make("check")
# shelltools.cd("python")
# pythonmodules.compile("test")
# shelltools.cd("..")
# shelltools.cd("python3")
# pythonmodules.compile("test", pyVer="3")
# shelltools.cd("..")
def install(): def install():
autotools.install() autotools.install()
shelltools.cd("python") shelltools.cd("python")
pythonmodules.install() pythonmodules.install()
shelltools.cd("..") shelltools.cd("..")
shelltools.cd("python3")
pythonmodules.install(pyVer="3")
shelltools.cd("..")
pisitools.insinto("/usr/share/vim/vimfiles/syntax/", "editors/proto.vim") pisitools.insinto("/usr/share/vim/vimfiles/syntax/", "editors/proto.vim")
pisitools.insinto("/usr/share/emacs/site-lisp/", "editors/protobuf-mode.el") pisitools.insinto("/usr/share/emacs/site-lisp/", "editors/protobuf-mode.el")
pisitools.dodoc("CHANGES.txt", "CONTRIBUTORS.txt", "LICENSE", "README.md") pisitools.dodoc("CHANGES.txt", "CONTRIBUTORS.txt", "LICENSE", "README.md")
+73 -26
View File
@@ -1,36 +1,39 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>protobuf</Name> <Name>protobuf</Name>
<Homepage>http://code.google.com/p/protobuf</Homepage> <Homepage>https://developers.google.com/protocol-buffers/</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<License>Apache-2.0</License> <PartOf>network.misc</PartOf>
<License>BSD</License>
<IsA>library</IsA> <IsA>library</IsA>
<Summary>Google's data interchange format</Summary> <Summary>Google's data interchange format</Summary>
<Description>Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats.</Description> <Description>Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats.</Description>
<Archive sha1sum="d403d06a8775375e7fe2557b38733205dfbc2e9e" type="targz">https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-all-3.6.1.tar.gz</Archive> <Archive sha1sum="65deb27c67346345f9b3b9606400e793b8ae120d" type="targz">https://github.com/protocolbuffers/protobuf/releases/download/v3.11.2/protobuf-all-3.11.2.tar.gz</Archive>
<Archive sha1sum="e7e646a6204638fe8e87e165292b8dd9cd4c36ed" type="targz">https://github.com/google/googletest/archive/release-1.8.0.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>python3-setuptools</Dependency>
<Dependency>python-setuptools</Dependency> <Dependency>python-setuptools</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>python-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>protobuf</Name> <Name>protobuf</Name>
<Summary>Google's data interchange format</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/libproto*</Path> <Path fileType="library">/usr/lib/libproto*</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/vim</Path>
<Path fileType="data">/usr/share/emacs</Path> <Path fileType="data">/usr/share/emacs</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/vim</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
</Package> </Package>
@@ -45,35 +48,79 @@
<Path fileType="data">/usr/lib/pkgconfig</Path> <Path fileType="data">/usr/lib/pkgconfig</Path>
</Files> </Files>
</Package> </Package>
<Package>
<Name>python-protobuf</Name>
<Summary>Python 2 bindings for Google Protocol Buffers</Summary>
<RuntimeDependencies>
<Dependency release="current">protobuf-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/python2*</Path>
</Files>
</Package>
<Package>
<Name>python3-protobuf</Name>
<Summary>Python 3 bindings for Google Protocol Buffers</Summary>
<RuntimeDependencies>
<Dependency release="current">protobuf-devel</Dependency>
<Dependency>python3</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/python3*</Path>
</Files>
</Package>
<History> <History>
<Update release="7">
<Date>2020-01-24</Date>
<Version>3.11.2</Version>
<Comment>Fix deps and clean</Comment>
<Name>Blue Devil</Name>
<Email>bluedevil@sctzine.com</Email>
</Update>
<Update release="6">
<Date>2019-12-25</Date>
<Version>3.11.2</Version>
<Comment>Version bump</Comment>
<Name>Blue Devil</Name>
<Email>bluedevil@sctzine.com</Email>
</Update>
<Update release="5">
<Date>2016-03-23</Date>
<Version>3.0.0_beta2</Version>
<Comment>Version bump, rebuilt with docker</Comment>
<Name>İbrahim KARAGÜZEL</Name>
<Email>karaguzelibrahim@gmail.com</Email>
</Update>
<Update release="4"> <Update release="4">
<Date>2018-08-06</Date> <Date>2015-02-16</Date>
<Version>3.6.1</Version> <Version>3.0.0_pre1</Version>
<Comment>Rebuild.</Comment> <Comment>Version bump.</Comment>
<Name>PisiLinux Community</Name> <Name>Vedat Demir</Name>
<Email>admins@pisilinux.org</Email> <Email>vedat@pisilinux.org</Email>
</Update> </Update>
<Update release="3"> <Update release="3">
<Date>2018-08-05</Date> <Date>2015-02-03</Date>
<Version>2.6.1</Version> <Version>2.6.1</Version>
<Comment>Rebuild.</Comment> <Comment>Version bump.</Comment>
<Name>PisiLinux Community</Name> <Name>Stefan Gronewold(groni)</Name>
<Email>admins@pisilinux.org</Email> <Email>groni@pisilinux.org</Email>
</Update> </Update>
<Update release="2"> <Update release="2">
<Date>2017-03-08</Date> <Date>2014-02-05</Date>
<Version>2.6.1</Version> <Version>2.5.0</Version>
<Comment>Rebuild.</Comment> <Comment>Version Bump.</Comment>
<Name>PisiLinux Community</Name> <Name>Alihan Öztürk</Name>
<Email>admins@pisilinux.org</Email> <Email>alihan@pisilinux.org</Email>
</Update> </Update>
<Update release="1"> <Update release="1">
<Date>2016-06-12</Date> <Date>2012-09-03</Date>
<Version>2.6.1</Version> <Version>2.4.1</Version>
<Comment>First release</Comment> <Comment>First release</Comment>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Update> </Update>
</History> </History>
</PISI> </PISI>
+14 -1
View File
@@ -9,5 +9,18 @@
<Package> <Package>
<Name>protobuf-devel</Name> <Name>protobuf-devel</Name>
<Summary xml:lang="tr">protobuf için geliştirme dosyaları</Summary> <Summary xml:lang="tr">protobuf için geliştirme dosyaları</Summary>
<Description xml:lang="tr">protobuf-devel, protobuf için geliştime dosyaları içerir.</Description>
</Package> </Package>
</PISI>
<Package>
<Name>python-protobuf</Name>
<Summary xml:lang="tr">protobuf için geliştirme dosyaları</Summary>
<Description xml:lang="tr">protobuf-devel, protobuf için geliştime dosyaları içerir.</Description>
</Package>
<Package>
<Name>python3-protobuf</Name>
<Summary xml:lang="tr">protobuf için geliştirme dosyaları</Summary>
<Description xml:lang="tr">protobuf-devel, protobuf için geliştime dosyaları içerir.</Description>
</Package>
</PISI>
+207004 -206952
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
7b9b3e637f28258bca0cabe540b5872a6a46a9d3 256fc2b803d70f5ccc6e35eb76e0d70749e50f6e
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
a08046286d0901da6efe3dae0460371ad4c39d50 e0db13a760c6800bfda136733493ebd9372d5d4b
+1 -1
View File
@@ -55,7 +55,7 @@
<History> <History>
<Update release="1"> <Update release="1">
<Date>20120-01-23</Date> <Date>2020-01-23</Date>
<Version>9.0.1</Version> <Version>9.0.1</Version>
<Comment>First release</Comment> <Comment>First release</Comment>
<Name>Idris Kalp</Name> <Name>Idris Kalp</Name>
+1 -1
View File
@@ -50,7 +50,7 @@
<History> <History>
<Update release="1"> <Update release="1">
<Date>220-01-11</Date> <Date>2020-01-11</Date>
<Version>2019.4</Version> <Version>2019.4</Version>
<Comment>First release</Comment> <Comment>First release</Comment>
<Name>Idris Kalp</Name> <Name>Idris Kalp</Name>
+1 -1
View File
@@ -28,7 +28,7 @@
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>vulkan-trace</Name> <Name>vulkan-trace</Name>
<RuntimeDependencies> <RuntimeDependencies>