Kaydet (Commit) 31cafdb4 authored tarafından sulincix's avatar sulincix

actionsapi ile ilgili ufak çaplı tespitler ve düzenlemeler

üst 6baca6ce
......@@ -39,6 +39,8 @@ class BinutilsError(inary.actionsapi.Error):
# Globals
if not inary.actionsapi.variables.glb:
inary.actionsapi.variables.initVariables()
env = inary.actionsapi.variables.glb.env
dirs = inary.actionsapi.variables.glb.dirs
config = inary.actionsapi.variables.glb.config
......
......@@ -62,6 +62,11 @@ def fixpc():
for f in ls("{}/*.pc".format(path)):
dosed(f, get.emul32prefixDIR(), get.defaultprefixDIR())
def configure(parameters="",type="meson"):
if type == "meson":
meson_configure(parameters)
else:
cmake_configure(parameters)
def meson_configure(parameters=""):
if can_access_file('meson.build'):
......@@ -113,6 +118,9 @@ def cmake_configure(parameters=""):
_('No configure script found. (\"{}\" file not found.)'.format("CMakeLists.txt")))
def make(parameters=""):
ninja_build(parameters)
def ninja_build(parameters=""):
if system("ninja {} {} -C inaryPackageBuild".format(get.makeJOBS(), parameters)):
raise NinjaBuildError(_("Build failed."))
......@@ -121,6 +129,8 @@ def ninja_build(parameters=""):
if isDirectory("{}/emul32".format(get.installDIR())):
removeDir("/emul32")
def install(parameters=""):
ninja_install(parameters)
def ninja_install(parameters=""):
insdir = util.join_path(
......
......@@ -774,6 +774,8 @@ class Builder:
# finished its work in the archive source directory.
curDir = os.getcwd()
src_dir = self.pkg_src_dir()
os.environ['CURDIR']=curDir
os.environ['SRCDIR']=src_dir
if os.path.exists(src_dir):
os.chdir(src_dir)
else:
......
......@@ -4,12 +4,17 @@
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
import os
from inary.actionsapi import shelltools
from inary.actionsapi import get
from inary.actionsapi import inarytools
from inary.actionsapi import mesontools
from inary.actionsapi import cmaketools
def install():
print("curdir="+get.curDIR())
print("workdir="+get.workDIR())
shelltools.system("mkdir -p {}/usr/bin/".format(get.installDIR()))
shelltools.system("install space {}/usr/bin/hello".format(get.installDIR()))
shelltools.system("env")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment