Commit Graph

28 Commits

Author SHA1 Message Date
Tony Theodore 802653a186 qjson: update and switch to qt5 2018-03-06 21:31:04 +11:00
Tony Theodore 01e2a64d00 cross packages: replace dependency gcc with cc 2017-12-23 08:19:00 +11:00
Viktor Szakats 45d34aaac7 more URL updates 2017-03-10 13:59:00 +00:00
Viktor Szakats e961e447fb URL updates 2017-03-04 10:33:47 +00:00
Boris Nagaev e2fd9fe23a use cmake wrapper in all packages
Native binaries (libmysqlclient, vtk, vtk6) still build with `cmake`
instead of the cmake wrapper. Note that even in these cases MXE's cmake
is used (not system cmake), because $(PREFIX)/$(BUILD)/bin is added to
PATH by Makefile and MXE's cmake binary exists there.
2017-01-08 03:01:54 +01:00
Boris Nagaev 74163f1794 add _WEBSITE and _DESCR fields to core packages
See https://github.com/mxe/mxe/issues/1422

Automation (Python 2 code): https://gist.github.com/9f5c315e5d0cf113d41dc454b7a0eb41
2016-12-22 22:25:48 +01:00
Boris Nagaev 6adb5ade12 Copyright headers: point to LICENSE.md and shorten
The following script was applied:

    sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE')

    sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \
        $(git grep -l 'part of MXE.*See index.html')

    before='This file is part of MXE. See index.html for further information.'
    after='This file is part of MXE. See LICENSE.md for licensing information.'
    sed "s/$before/$after/" -i $(git grep -l 'part of MXE')

Then git grep 'index.html for further information' revealed two other files.
One of them was patched manually (patch.mk). Makefile has text
"See index.html for further information" unrelated to licensing.

See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-27 12:31:29 +03:00
Boris Nagaev 17e40d3884 use $(TEST_FILE) instead of $(2).c and other
The following script was applied:

    set -xue

    find src/ plugins/ -name '*.mk' -type f > mks

    # special cases for test file:
    # ls -d src/*-test* | sed 's@-test.*@@' | sort | uniq --repeated
    sed 's@$(2).c@$(PWD)/src/$(PKG)-test.c@g' -i \
        src/{boost,freeimage,hdf5,lapack,sdl,sdl_image,sdl_sound}.mk
    sed 's@$(2).f@$(PWD)/src/$(PKG)-test.f@g' -i src/lapack.mk
    sed 's@$(PWD)/$(2).pro@$(PWD)/src/$(PKG)-test.pro@g' -i \
        src/qt.mk plugins/examples/custom-qt-min/overrides.mk
    sed 's@$(2)-CMakeLists.txt@$(PWD)/src/$(PKG)-test-CMakeLists.txt@g' \
        -i src/{sdl_image,sdl_sound}.mk

    # check
    for base in $(ls -d src/*-test* | sed 's@-test.*@@' | sort | uniq --repeated); do
        ! grep -q '$(2)' "${base}.mk"
    done

    # other $(2)
    sed 's@$(2).cpp@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).cxx@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).c@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).ml@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).f@$(TEST_FILE)@g' -i $(cat mks)

    # check
    ! grep '$(2)' $(cat mks)

See https://github.com/mxe/mxe/issues/1452
2016-07-30 22:38:45 +03:00
Pavel Vatagin 8417b59f26 qjson: install pkg-config file 2016-02-13 20:47:00 +03:00
Tony Theodore fc0ed34fb9 all packages: really use sha256 checksums 2015-09-23 18:32:58 +10:00
Tony Theodore a228c0488f all packages: switch to sha256 checksums
closes #871
2015-09-23 17:27:16 +10:00
Tony Theodore 577159f4e9 package qjson: enable shared build 2014-04-03 22:15:53 +11:00
Volker Grabsch e412eb642d Move package versions from index.html back into the src/*.mk files
Most of the automatic conversion was done using the following Python script:

import os
import re
pkgs = sorted(mkfile[:-len('.mk')] for mkfile in os.listdir('src') if mkfile.endswith('.mk'))
with open('index.html', 'rb') as f:
    index = f.read()
pkgs_index = re.findall('<td class="package">([^<]*)</td>', index)
assert pkgs_index == pkgs
versions = dict(re.findall('<td id="([^"]*)-version">([^<]*)</td>', index))
assert sorted(versions.keys()) == pkgs
for pkg in pkgs:
    version = versions[pkg]
    with open('src/' + pkg + '.mk', 'rb') as f:
        mk = f.read()
    checksumpos = mk.index('\n$(PKG)_CHECKSUM ')
    versionline = '\n$(PKG)_VERSION  := %(version)s' % {'version': version}
    newmk = mk[:checksumpos] + versionline + mk[checksumpos:]
    with open('src/' + pkg + '.mk', 'wb') as f:
        f.write(newmk)
2013-07-22 01:41:31 +02:00
Mark Brand ba2106d3f0 adjust references to qmake (Qt 4)
Follow-up to previous commit.
2013-04-02 22:09:27 +02:00
Mark Brand b4d5284a26 update package qjson 2012-11-27 12:14:07 +01:00
Mark Brand 9faa9f663f update package qjson 2012-11-23 10:09:01 +01:00
Volker Grabsch c80ee377b2 Move CMAKE_BUILD_TYPE into toolchain file 2012-08-25 16:40:28 +02:00
Volker Grabsch 070e7a680d Revert "Move CMAKE_BUILD_TYPE, CMAKE_AR and CMAKE_RANLIB into toolchain file"
This reverts commit e57db6d8c9.

See http://lists.nongnu.org/archive/html/mingw-cross-env-list/2012-08/msg00028.html
2012-08-25 16:11:23 +02:00
Volker Grabsch e57db6d8c9 Move CMAKE_BUILD_TYPE, CMAKE_AR and CMAKE_RANLIB into toolchain file 2012-08-13 10:15:30 +02:00
Tony Theodore 4ed13a9f30 all packages: use $(WGET) portability variable 2012-05-16 17:49:40 +10:00
Volker Grabsch 00f4690d3f Move full package names from src/*.mk into package list (index.html) 2012-03-29 21:41:44 +02:00
Volker Grabsch 635174b15b Add missing package name comments 2012-03-29 21:08:13 +02:00
Volker Grabsch 2c6dd869e1 Remove annoying blank lines 2012-03-29 21:04:23 +02:00
Volker Grabsch 7badad85c9 Move doc/index.html -> index.html 2012-03-29 12:14:15 +02:00
Volker Grabsch 7e6723adb5 Move $(PKG)_VERSION and $(PKG)_WEBSITE from src/*.mk into doc/index.html 2012-03-29 11:07:07 +02:00
Volker Grabsch defdff28f0 Rebrand to new project name MXE 2012-03-28 15:46:58 +02:00
Mark Brand 614dad4e29 set QT_QMAKE_EXECUTABLE in cmake toolchain file
When this is not set, cmake might use the host's qmake.
Problem observed bulding package openscenegraph.
2011-10-19 01:24:22 +02:00
Mark Brand 5f9ddbc738 new package: qjson 2011-07-13 22:45:26 +02:00