change structure

This commit is contained in:
Syping 2019-10-12 05:19:27 +02:00
parent da69c259be
commit df496eae97
73 changed files with 170 additions and 169 deletions

View file

@ -2,7 +2,7 @@ stages:
- build
- deploy
luaengine:
LuaEngine Windows:
stage: build
image: syping/qt5-shared-mingw-openssl:5.12.5
variables:
@ -10,23 +10,23 @@ luaengine:
script:
- mkdir -p build
- cd build
- qmake CONFIG+=WITH_LUAENGINERUN ../luaengineapp.pro
- qmake CONFIG+=WITH_LUAENGINERUN ../luaengine.pro
- make -j4
- cp -Rf src/luaengine/release/luaengine.dll ../
- cp -Rf src/luaenginerun/release/luaengine.exe ../
- cp -Rf src/luaenginegui/release/luaenginegui.dll ../
- cp -Rf src/luaengineio/release/luaengineio.dll ../
- cp -Rf src/luaengineos/release/luaengineos.dll ../
- cp -Rf src/luaenginecore/release/LuaEngine.dll ../
- cp -Rf src/luaenginegui/release/LuaEngineGui.dll ../
- cp -Rf src/luaengineio/release/LuaEngineIO.dll ../
- cp -Rf src/luaengineos/release/LuaEngineOS.dll ../
- cp -Rf src/luaengine/release/LuaEngine.exe ../
- cd ..
artifacts:
paths:
- "luaengine.dll"
- "luaengine.exe"
- "luaenginegui.dll"
- "luaengineio.dll"
- "luaengineos.dll"
- "LuaEngine.dll"
- "LuaEngine.exe"
- "LuaEngineGui.dll"
- "LuaEngineIO.dll"
- "LuaEngineOS.dll"
luaengineapp:
LuaEngineApp:
stage: build
image: syping/qt5-static-mingw-openssl:5.12.5
variables:
@ -36,11 +36,11 @@ luaengineapp:
- cd build
- qmake-static CONFIG+=WITH_LUAENGINEAPP ../luaengineapp.pro
- make -j4
- cp -Rf src/luaengineapp/release/luaengineapp.exe ../
- cp -Rf src/luaengineapp/release/LuaEngineApp.exe ../
- cd ..
artifacts:
paths:
- "luaengineapp.exe"
- "LuaEngineApp.exe"
LuaEngine Setup:
stage: deploy
@ -48,11 +48,10 @@ LuaEngine Setup:
script:
- apt-get update -qq
- apt-get install nsis -qq
- nsis
artifacts:
name: "luaengine-$CI_COMMIT_REF_NAME-${CI_COMMIT_SHA:0:8}"
paths:
- "luaengine_setup.exe"
dependencies:
- luaengine
- luaengineapp
- LuaEngine Windows
- LuaEngineApp

View file

@ -1,6 +1,6 @@
#/*****************************************************************************
#* luaEngine Lua Engine for Qt
#* Copyright (C) 2018-2019 Syping
#* Copyright (C) 2019 Syping
#*
#* Licensed under the Apache License, Version 2.0 (the "License");
#* you may not use this file except in compliance with the License.
@ -15,94 +15,23 @@
#* limitations under the License.
#*****************************************************************************/
QT -= gui
QT += core gui widgets
TARGET = luaengine
TEMPLATE = lib
CONFIG += c++11 \
skip_target_version_ext
VERSION = 0.1
win32: TARGET = LuaEngine
CONFIG += c++11
DEFINES += LUAENGINE_LIBRARY
DEFINES += LUA_COMPAT_5_2
shared: win32: DEFINES += LUA_BUILD_AS_DLL
static: DEFINES += LUAENGINE_STATIC
linux: DEFINES += LUA_USE_LINUX
gcc: QMAKE_CFLAGS += -Wno-cast-function-type
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/debug -lLuaEngineOS -L$$OUT_PWD/../luaengineio/debug -lLuaEngineIO -L$$OUT_PWD/../luaenginegui/debug -lLuaEngineGui -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/release -lLuaEngineOS -L$$OUT_PWD/../luaengineio/release -lLuaEngineIO -L$$OUT_PWD/../luaenginegui/release -lLuaEngineGui -L$$OUT_PWD/../luaenginecore/release -lLuaEngine
unix: LIBS += -L$$OUT_PWD/../luaengineos -lLuaEngineOS -L$$OUT_PWD/../luaengineio -lLuaEngineIO -L$$OUT_PWD/../luaenginegui -lLuaEngineGui -L$$OUT_PWD/../luaenginecore -lLuaEngine
INCLUDEPATH += \
../luaenginecore/lua \
../luaenginecore/luaengine \
../luaenginegui/luaengine \
../luaengineio/luaengine \
../luaengineos/luaengine
SOURCES += \
luaengine/LuaEngine.cpp
HEADERS += \
luaengine/LuaEngine.h \
luaengine/LuaEngine_global.h \
luaengine/LuaEngine_macro.h
SOURCES += \
lua/lapi.c \
lua/lauxlib.c \
lua/lbaselib.c \
lua/lbitlib.c \
lua/lcode.c \
lua/lcorolib.c \
lua/lctype.c \
lua/ldblib.c \
lua/ldebug.c \
lua/ldo.c \
lua/ldump.c \
lua/lfunc.c \
lua/lgc.c \
lua/linit.c \
lua/liolib.c \
lua/llex.c \
lua/lmathlib.c \
lua/lmem.c \
lua/loadlib.c \
lua/lobject.c \
lua/lopcodes.c \
lua/loslib.c \
lua/lparser.c \
lua/lstate.c \
lua/lstring.c \
lua/lstrlib.c \
lua/ltable.c \
lua/ltablib.c \
lua/ltm.c \
lua/lundump.c \
lua/lutf8lib.c \
lua/lvm.c \
lua/lzio.c
HEADERS += \
lua/lapi.h \
lua/lauxlib.h \
lua/lcode.h \
lua/lctype.h \
lua/ldebug.h \
lua/ldo.h \
lua/lfunc.h \
lua/lgc.h \
lua/llex.h \
lua/llimits.h \
lua/lmem.h \
lua/lobject.h \
lua/lopcodes.h \
lua/lparser.h \
lua/lprefix.h \
lua/lstate.h \
lua/lstring.h \
lua/ltable.h \
lua/ltm.h \
lua/lua.h \
lua/luaconf.h \
lua/lualib.h \
lua/lundump.h \
lua/lvm.h \
lua/lzio.h
win32 {
RC_LANG = 0x0
QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine Library"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2018-2019 Syping"
QMAKE_TARGET_PRODUCT = "luaengine"
}
main.cpp

View file

@ -17,17 +17,18 @@
QT += core gui widgets
TARGET = luaengineapp
win32: TARGET = LuaEngineApp
CONFIG += c++11
static: DEFINES += LUAENGINE_STATIC
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/debug -lluaengineos -L$$OUT_PWD/../luaengineio/debug -lluaengineio -L$$OUT_PWD/../luaenginegui/debug -lluaenginegui -L$$OUT_PWD/../luaengine/debug -lluaengine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/release -lluaengineos -L$$OUT_PWD/../luaengineio/release -lluaengineio -L$$OUT_PWD/../luaenginegui/release -lluaenginegui -L$$OUT_PWD/../luaengine/release -lluaengine
unix: LIBS += -L$$OUT_PWD/../luaengineos -lluaengineos -L$$OUT_PWD/../luaengineio -lluaengineio -L$$OUT_PWD/../luaenginegui -lluaenginegui -L$$OUT_PWD/../luaengine -lluaengine
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/debug -lLuaEngineOS -L$$OUT_PWD/../luaengineio/debug -lLuaEngineIO -L$$OUT_PWD/../luaenginegui/debug -lLuaEngineGui -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/release -lLuaEngineOS -L$$OUT_PWD/../luaengineio/release -lLuaEngineIO -L$$OUT_PWD/../luaenginegui/release -lLuaEngineGui -L$$OUT_PWD/../luaenginecore/release -lLuaEngine
unix: LIBS += -L$$OUT_PWD/../luaengineos -lLuaEngineOS -L$$OUT_PWD/../luaengineio -lLuaEngineIO -L$$OUT_PWD/../luaenginegui -lLuaEngineGui -L$$OUT_PWD/../luaenginecore -lLuaEngine
INCLUDEPATH += \
../luaengine/lua \
../luaengine/luaengine \
../luaenginecore/lua \
../luaenginecore/luaengine \
../luaenginegui/luaengine \
../luaengineio/luaengine \
../luaengineos/luaengine

View file

@ -0,0 +1,108 @@
#/*****************************************************************************
#* luaEngine Lua Engine for Qt
#* Copyright (C) 2018-2019 Syping
#*
#* Licensed under the Apache License, Version 2.0 (the "License");
#* you may not use this file except in compliance with the License.
#* You may obtain a copy of the License at
#*
#* http://www.apache.org/licenses/LICENSE-2.0
#*
#* Unless required by applicable law or agreed to in writing, software
#* distributed under the License is distributed on an "AS IS" BASIS,
#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#* See the License for the specific language governing permissions and
#* limitations under the License.
#*****************************************************************************/
QT -= gui
TARGET = LuaEngine
TEMPLATE = lib
CONFIG += c++11 \
skip_target_version_ext
VERSION = 0.1
DEFINES += LUAENGINE_LIBRARY
DEFINES += LUA_COMPAT_5_2
shared: win32: DEFINES += LUA_BUILD_AS_DLL
static: DEFINES += LUAENGINE_STATIC
linux: DEFINES += LUA_USE_LINUX
gcc: QMAKE_CFLAGS += -Wno-cast-function-type
SOURCES += \
luaengine/LuaEngine.cpp
HEADERS += \
luaengine/LuaEngine.h \
luaengine/LuaEngine_global.h \
luaengine/LuaEngine_macro.h
SOURCES += \
lua/lapi.c \
lua/lauxlib.c \
lua/lbaselib.c \
lua/lbitlib.c \
lua/lcode.c \
lua/lcorolib.c \
lua/lctype.c \
lua/ldblib.c \
lua/ldebug.c \
lua/ldo.c \
lua/ldump.c \
lua/lfunc.c \
lua/lgc.c \
lua/linit.c \
lua/liolib.c \
lua/llex.c \
lua/lmathlib.c \
lua/lmem.c \
lua/loadlib.c \
lua/lobject.c \
lua/lopcodes.c \
lua/loslib.c \
lua/lparser.c \
lua/lstate.c \
lua/lstring.c \
lua/lstrlib.c \
lua/ltable.c \
lua/ltablib.c \
lua/ltm.c \
lua/lundump.c \
lua/lutf8lib.c \
lua/lvm.c \
lua/lzio.c
HEADERS += \
lua/lapi.h \
lua/lauxlib.h \
lua/lcode.h \
lua/lctype.h \
lua/ldebug.h \
lua/ldo.h \
lua/lfunc.h \
lua/lgc.h \
lua/llex.h \
lua/llimits.h \
lua/lmem.h \
lua/lobject.h \
lua/lopcodes.h \
lua/lparser.h \
lua/lprefix.h \
lua/lstate.h \
lua/lstring.h \
lua/ltable.h \
lua/ltm.h \
lua/lua.h \
lua/luaconf.h \
lua/lualib.h \
lua/lundump.h \
lua/lvm.h \
lua/lzio.h
win32 {
RC_LANG = 0x0
QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine Library"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2018-2019 Syping"
QMAKE_TARGET_PRODUCT = "LuaEngine"
}

View file

@ -16,7 +16,7 @@
#*****************************************************************************/
QT += core gui widgets
TARGET = luaenginegui
TARGET = LuaEngineGui
TEMPLATE = lib
CONFIG += c++11 \
skip_target_version_ext
@ -25,13 +25,13 @@ VERSION = 0.1
DEFINES += LUAENGINEGUI_LIBRARY
static: DEFINES += LUAENGINE_STATIC
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/debug -lluaengine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/release -lluaengine
unix: LIBS += -L$$OUT_PWD/../luaengine -lluaengine
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/release -lLuaEngine
unix: LIBS += -L$$OUT_PWD/../luaenginecore -lLuaEngine
INCLUDEPATH += \
../luaengine/lua \
../luaengine/luaengine
../luaenginecore/lua \
../luaenginecore/luaengine
SOURCES += \
luaengine/LuaEngineGui.cpp
@ -45,5 +45,5 @@ win32 {
QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine Gui Library"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2018-2019 Syping"
QMAKE_TARGET_PRODUCT = "luaenginegui"
QMAKE_TARGET_PRODUCT = "LuaEngineGui"
}

View file

@ -16,7 +16,7 @@
#*****************************************************************************/
QT += core
TARGET = luaengineio
TARGET = LuaEngineIO
TEMPLATE = lib
CONFIG += c++11 \
skip_target_version_ext
@ -25,13 +25,13 @@ VERSION = 0.1
DEFINES += LUAENGINEIO_LIBRARY
static: DEFINES += LUAENGINE_STATIC
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/debug -lluaengine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/release -lluaengine
unix: LIBS += -L$$OUT_PWD/../luaengine -lluaengine
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/release -lLuaEngine
unix: LIBS += -L$$OUT_PWD/../luaenginecore -lLuaEngine
INCLUDEPATH += \
../luaengine/lua \
../luaengine/luaengine
../luaenginecore/lua \
../luaenginecore/luaengine
SOURCES += \
luaengine/LuaEngineIO.cpp
@ -45,5 +45,5 @@ win32 {
QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine I/O Library"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2019 Syping"
QMAKE_TARGET_PRODUCT = "luaengineio"
QMAKE_TARGET_PRODUCT = "LuaEngineIO"
}

View file

@ -16,7 +16,7 @@
#*****************************************************************************/
QT += core
TARGET = luaengineos
TARGET = LuaEngineOS
TEMPLATE = lib
CONFIG += c++11 \
skip_target_version_ext
@ -25,13 +25,13 @@ VERSION = 0.1
DEFINES += LUAENGINEOS_LIBRARY
static: DEFINES += LUAENGINE_STATIC
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/debug -lluaengine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengine/release -lluaengine
unix: LIBS += -L$$OUT_PWD/../luaengine -lluaengine
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/debug -lLuaEngine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaenginecore/release -lLuaEngine
unix: LIBS += -L$$OUT_PWD/../luaenginecore -lLuaEngine
INCLUDEPATH += \
../luaengine/lua \
../luaengine/luaengine
../luaenginecore/lua \
../luaenginecore/luaengine
SOURCES += \
luaengine/LuaEngineOS.cpp
@ -45,5 +45,5 @@ win32 {
QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine OS Library"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2019 Syping"
QMAKE_TARGET_PRODUCT = "luaengineos"
QMAKE_TARGET_PRODUCT = "LuaEngineOS"
}

View file

@ -1,36 +0,0 @@
#/*****************************************************************************
#* luaEngine Lua Engine for Qt
#* Copyright (C) 2019 Syping
#*
#* Licensed under the Apache License, Version 2.0 (the "License");
#* you may not use this file except in compliance with the License.
#* You may obtain a copy of the License at
#*
#* http://www.apache.org/licenses/LICENSE-2.0
#*
#* Unless required by applicable law or agreed to in writing, software
#* distributed under the License is distributed on an "AS IS" BASIS,
#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#* See the License for the specific language governing permissions and
#* limitations under the License.
#*****************************************************************************/
QT += core gui widgets
TARGET = luaengine
CONFIG += c++11
static: DEFINES += LUAENGINE_STATIC
CONFIG(debug, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/debug -lluaengineos -L$$OUT_PWD/../luaengineio/debug -lluaengineio -L$$OUT_PWD/../luaenginegui/debug -lluaenginegui -L$$OUT_PWD/../luaengine/debug -lluaengine
CONFIG(release, debug|release): win32: LIBS += -L$$OUT_PWD/../luaengineos/release -lluaengineos -L$$OUT_PWD/../luaengineio/release -lluaengineio -L$$OUT_PWD/../luaenginegui/release -lluaenginegui -L$$OUT_PWD/../luaengine/release -lluaengine
unix: LIBS += -L$$OUT_PWD/../luaengineos -lluaengineos -L$$OUT_PWD/../luaengineio -lluaengineio -L$$OUT_PWD/../luaenginegui -lluaenginegui -L$$OUT_PWD/../luaengine -lluaengine
INCLUDEPATH += \
../luaengine/lua \
../luaengine/luaengine \
../luaenginegui/luaengine \
../luaengineio/luaengine \
../luaengineos/luaengine
SOURCES += \
main.cpp

View file

@ -18,10 +18,10 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += luaengine \
SUBDIRS += luaenginecore \
luaenginegui \
luaengineio \
luaengineos
CONFIG(WITH_LUAENGINEAPP): SUBDIRS += luaengineapp
CONFIG(WITH_LUAENGINERUN): SUBDIRS += luaenginerun
CONFIG(WITH_LUAENGINERUN): SUBDIRS += luaengine