Skip to content

Commit 4b21927

Browse files
coder4869coder4869
committed
1.1.5.0:re-orginaze plugins
1 parent 78f6523 commit 4b21927

File tree

189 files changed

+262
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+262
-183
lines changed

‎.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
**/build_win
55
**/build_ios
66
**/build_android
7-
app/data/plugins
87
app/bin
98
app/bin64
109
app/bin_ios
1110
app/lib
1211
app/logs
1312
app/tools
1413

15-
plugins/templates/android/.gradle
16-
plugins/templates/android/**/build
14+
pre-dev/templates/android/.gradle
15+
pre-dev/templates/android/**/build
1716

1817
app/tools/glog-*
1918
app/tools/spdlog-*

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions

‎app/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ message("CMAKE_TOOLCHAIN_ROOT = ${CMAKE_TOOLCHAIN_ROOT} ")
3232
message("include(${CMAKE_TOOLCHAIN_ROOT}/cmake-core/global.cmake) ")
3333

3434

35-
project(${PROJECT_NAME} VERSION 1.1.4.0)
35+
project(${PROJECT_NAME} VERSION 1.1.5.0)
3636
# set(CMAKE_DEBUG_POSTFIX d)
3737
set(LIB_TYPE SHARED) # SHARED STATIC
3838
# set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
@@ -143,16 +143,16 @@ if(NOT ANDROID)
143143
)
144144
endif(NOT ANDROID)
145145

146-
set(PLUGIN_DIR ${PROJ_ROOT}/../plugins)
147-
File(GLOB_RECURSE PLUGIN_FILEs ${PLUGIN_DIR}/*.*)
148-
list(FILTER PLUGIN_FILEs EXCLUDE REGEX "${PROJ_ROOT}/../plugins/templates/*")
149-
if(NOT ANDROID)
150-
source_group(
151-
TREE ${PLUGIN_DIR}
152-
PREFIX "plugins"
153-
FILES ${PLUGIN_FILEs}
154-
)
155-
endif(NOT ANDROID)
146+
# set(PLUGIN_DIR ${PROJ_ROOT}/plugins)
147+
# File(GLOB_RECURSE PLUGIN_FILEs ${PLUGIN_DIR}/*.*)
148+
# list(FILTER PLUGIN_FILEs EXCLUDE REGEX "${PLUGIN_DIR}/templates/*")
149+
# if(NOT ANDROID)
150+
# source_group(
151+
# TREE ${PLUGIN_DIR}
152+
# PREFIX "plugins"
153+
# FILES ${PLUGIN_FILEs}
154+
# )
155+
# endif(NOT ANDROID)
156156

157157
set(TOOL_DIR ${PROJ_ROOT}/../tools)
158158
File(GLOB_RECURSE TOOL_FILEs ${TOOL_DIR}/*.*)

‎plugins/project/DevKits.json renamed to ‎app/data/plugins/project/DevKits.json

File renamed without changes.

‎plugins/project/module/module.py renamed to ‎app/data/plugins/project/module/module.py

File renamed without changes.

‎plugins/project/module/template/cmake/bin-deps-qt.cmake renamed to ‎app/data/plugins/project/module/template/cmake/bin-deps-qt.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ target_link_libraries(${BIN_NAME} PUBLIC ${LIB_FMWKs} ${LIB_DEPS}
7979

8080
# add app res
8181
# APP_ADD_RES("${PROJ_ROOT}/conf/project.json" "conf/")
82-
APP_ADD_RES_RECURSE("${CONF_DIR}/" "conf/" "${CONF_DIR}/*")
83-
APP_ADD_RES_RECURSE("${DATA_DIR}/" "data/" "${DATA_DIR}/*")
82+
# APP_ADD_RES_RECURSE("${CONF_DIR}/" "conf/" "${CONF_DIR}/*")
83+
# APP_ADD_RES_RECURSE("${DATA_DIR}/" "data/" "${DATA_DIR}/*")
8484
# APP_ADD_RES_RECURSE("${PLUGIN_DIR}/" "data/plugins/" "${PLUGIN_DIR}/*")
8585
APP_ADD_RES_RECURSE("${TOOL_DIR}/" "tools/" "${TOOL_DIR}/*")
8686

‎plugins/project/module/template/cmake/bin-deps.cmake renamed to ‎app/data/plugins/project/module/template/cmake/bin-deps.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ target_link_libraries(${BIN_NAME} PUBLIC ${LIB_FMWKs} ${LIB_DEPS}
5050

5151
# add app res
5252
# APP_ADD_RES("${PROJ_ROOT}/conf/project.json" "conf/")
53-
APP_ADD_RES_RECURSE("${CONF_DIR}/" "conf/" "${CONF_DIR}/*")
54-
APP_ADD_RES_RECURSE("${DATA_DIR}/" "data/" "${DATA_DIR}/*")
53+
# APP_ADD_RES_RECURSE("${CONF_DIR}/" "conf/" "${CONF_DIR}/*")
54+
# APP_ADD_RES_RECURSE("${DATA_DIR}/" "data/" "${DATA_DIR}/*")
5555
# APP_ADD_RES_RECURSE("${PLUGIN_DIR}/" "data/plugins/" "${PLUGIN_DIR}/*")
5656
APP_ADD_RES_RECURSE("${TOOL_DIR}/" "tools/" "${TOOL_DIR}/*")
5757

‎plugins/project/module/template/cmake/lib-deps-norm.cmake renamed to ‎app/data/plugins/project/module/template/cmake/lib-deps-norm.cmake

File renamed without changes.

‎plugins/project/module/template/cmake/lib-deps-qt.cmake renamed to ‎app/data/plugins/project/module/template/cmake/lib-deps-qt.cmake

File renamed without changes.

‎plugins/project/module/template/cmake/lib.cmake renamed to ‎app/data/plugins/project/module/template/cmake/lib.cmake

File renamed without changes.

‎plugins/project/module/template/cmake/norm.cmake renamed to ‎app/data/plugins/project/module/template/cmake/norm.cmake

File renamed without changes.

‎plugins/project/module/template/cmake/qt.cmake renamed to ‎app/data/plugins/project/module/template/cmake/qt.cmake

File renamed without changes.

‎plugins/project/module/template/code/CLASS_NAME.cpp renamed to ‎app/data/plugins/project/module/template/code/CLASS_NAME.cpp

File renamed without changes.

‎plugins/project/module/template/code/CLASS_NAME.h renamed to ‎app/data/plugins/project/module/template/code/CLASS_NAME.h

File renamed without changes.

‎plugins/project/module/template/code/MODULE_NAME.h renamed to ‎app/data/plugins/project/module/template/code/MODULE_NAME.h

File renamed without changes.

‎plugins/project/module/template/code/MODULE_NAMEDef.h renamed to ‎app/data/plugins/project/module/template/code/MODULE_NAMEDef.h

File renamed without changes.

‎plugins/project/module/template/code/main.cpp.NORM renamed to ‎app/data/plugins/project/module/template/code/main.cpp.NORM

File renamed without changes.

‎plugins/project/module/template/code/main.cpp.QT renamed to ‎app/data/plugins/project/module/template/code/main.cpp.QT

File renamed without changes.

‎plugins/project/project.json renamed to ‎app/data/plugins/project/project.json

File renamed without changes.

‎plugins/project/project/build/run_android.bat renamed to ‎app/data/plugins/project/project/build/run_android.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ md %BUILD_DIR%
2828
if exist %BIN_DIR% rd /s /q %BIN_DIR%
2929

3030
:: clean py cache
31-
SET PLUGIN_DIR=%ROOT_DIR%\..\plugins
31+
SET PLUGIN_DIR=%ROOT_DIR%\app\data\plugins
3232
echo PLUGIN_DIR = %PLUGIN_DIR%
3333
for /f "delims=" %%i in ('dir /ad/b/s "%PLUGIN_DIR%"') do (
3434
if exist %%i\.DS_Store rd /s /q %%i\.DS_Store

‎plugins/project/project/build/run_android.sh renamed to ‎app/data/plugins/project/project/build/run_android.sh

File renamed without changes.

‎plugins/project/project/build/run_ios.sh renamed to ‎app/data/plugins/project/project/build/run_ios.sh

File renamed without changes.

‎plugins/project/project/build/run_unix.sh renamed to ‎app/data/plugins/project/project/build/run_unix.sh

File renamed without changes.

‎plugins/project/project/build/run_win.bat renamed to ‎app/data/plugins/project/project/build/run_win.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ echo QT_INSTALL_DIR = %QT_INSTALL_DIR%
4242
echo PY_INSTALL_DIR = %PY_INSTALL_DIR%
4343

4444
:: clean py cache
45-
SET PLUGIN_DIR=%ROOT_DIR%\..\plugins
45+
SET PLUGIN_DIR=%ROOT_DIR%\app\data\plugins
4646
echo PLUGIN_DIR = %PLUGIN_DIR%
4747
for /f "delims=" %%i in ('dir /ad/b/s "%PLUGIN_DIR%"') do (
4848
if exist %%i\.DS_Store rd /s /q %%i\.DS_Store

‎plugins/project/project/cmake/cmake-apple/apple_func.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-apple/apple_func.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-apple/apple_libs.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-apple/apple_libs.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-apple/iOS.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-apple/iOS.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-apple/ios.toolchain.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-apple/ios.toolchain.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-apple/res/AppIcon.icns renamed to ‎app/data/plugins/project/project/cmake/cmake-apple/res/AppIcon.icns

File renamed without changes.

‎plugins/project/project/cmake/cmake-apple/res/IOSBundleInfo.plist.in renamed to ‎app/data/plugins/project/project/cmake/cmake-apple/res/IOSBundleInfo.plist.in

File renamed without changes.

‎plugins/project/project/cmake/cmake-apple/res/MacOSXBundleInfo.plist.in renamed to ‎app/data/plugins/project/project/cmake/cmake-apple/res/MacOSXBundleInfo.plist.in

File renamed without changes.

‎plugins/project/project/cmake/cmake-core/build_clang.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-core/build_clang.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-core/build_gcc.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-core/build_gcc.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-core/build_nmake.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-core/build_nmake.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-core/cmake_uninstall.cmake.in renamed to ‎app/data/plugins/project/project/cmake/cmake-core/cmake_uninstall.cmake.in

File renamed without changes.

‎plugins/project/project/cmake/cmake-core/core_func.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-core/core_func.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,17 @@ endfunction(APP_ADD_RES_RECURSE_PLAIN)
9696

9797
# e.g.
9898
# set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
99-
# set(PLUGIN_DIR ${PROJ_ROOT}/../plugins)
100-
# File(GLOB_RECURSE PLUGIN_FILEs ${PLUGIN_DIR}/*.*)
99+
# set(DATA_DIR ${PROJ_ROOT}/data)
100+
# File(GLOB_RECURSE DATA_FILEs ${DATA_DIR}/*.*)
101101
# if(NOT ANDROID)
102102
# source_group(
103-
# TREE ${PLUGIN_DIR}
103+
# TREE ${DATA_DIR}
104104
# PREFIX "plugins"
105-
# FILES ${PLUGIN_FILEs}
105+
# FILES ${DATA_FILEs}
106106
# )
107107
# endif(NOT ANDROID)
108-
# add_executable(${PROJECT_NAME} ${OS_BUNDLE} ${SRC_FILES} ${PLUGIN_FILEs})
109-
# APP_ADD_RES_RECURSE("${PLUGIN_DIR}/" "data/plugins/" "${PLUGIN_DIR}/*.*")
108+
# add_executable(${PROJECT_NAME} ${OS_BUNDLE} ${SRC_FILES} ${DATA_FILEs})
109+
# APP_ADD_RES_RECURSE("${DATA_DIR}/" "data/" "${DATA_DIR}/*.*")
110110
function(APP_ADD_RES_RECURSE src_dir dst_dir src_files)
111111
get_filename_component(src_dir ${src_dir} ABSOLUTE)
112112
message("APP_ADD_RES_RECURSE() src_dir = ${src_dir} ; dst_dir = ${dst_dir} ; src_files = ${src_files} ")

‎plugins/project/project/cmake/cmake-core/global.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-core/global.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-core/macros.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-core/macros.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-py/py_func.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-py/py_func.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-py/py_libs.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-py/py_libs.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-qt/qt_func.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-qt/qt_func.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-qt/qt_libs.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-qt/qt_libs.cmake

File renamed without changes.

‎plugins/project/project/cmake/cmake-win/res/windows_metafile.rc.in renamed to ‎app/data/plugins/project/project/cmake/cmake-win/res/windows_metafile.rc.in

File renamed without changes.

‎plugins/project/project/cmake/cmake-win/win_func.cmake renamed to ‎app/data/plugins/project/project/cmake/cmake-win/win_func.cmake

File renamed without changes.

‎plugins/project/project/cmake/find-deps/FindASSIMP.cmake renamed to ‎app/data/plugins/project/project/cmake/find-deps/FindASSIMP.cmake

File renamed without changes.

‎plugins/project/project/cmake/find-deps/FindGLM.cmake renamed to ‎app/data/plugins/project/project/cmake/find-deps/FindGLM.cmake

File renamed without changes.

‎plugins/project/project/cmake/find-deps/FindSDL2.cmake renamed to ‎app/data/plugins/project/project/cmake/find-deps/FindSDL2.cmake

File renamed without changes.

‎plugins/project/project/doc/License.txt renamed to ‎app/data/plugins/project/project/doc/License.txt

File renamed without changes.

‎plugins/project/project/pkg-rpm/SPECS/app.spec renamed to ‎app/data/plugins/project/project/pkg-rpm/SPECS/app.spec

File renamed without changes.

‎plugins/project/project/pkg-rpm/app-action.xml renamed to ‎app/data/plugins/project/project/pkg-rpm/app-action.xml

File renamed without changes.

‎plugins/project/project/pkg-rpm/app-desktop renamed to ‎app/data/plugins/project/project/pkg-rpm/app-desktop

File renamed without changes.

‎plugins/project/project/pkg-rpm/app_loader renamed to ‎app/data/plugins/project/project/pkg-rpm/app_loader

File renamed without changes.

‎plugins/project/project/pkg-rpm/pkg-rpm.sh renamed to ‎app/data/plugins/project/project/pkg-rpm/pkg-rpm.sh

File renamed without changes.

‎plugins/project/project/pkg-win/Note.md renamed to ‎app/data/plugins/project/project/pkg-win/Note.md

Lines changed: 3 additions & 1 deletion

‎plugins/project/project/pkg-win/PkgFunc_Win.nsh renamed to ‎app/data/plugins/project/project/pkg-win/PkgFunc_Win.nsh

File renamed without changes.

‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x64-ansi/ExecDos.dll renamed to ‎app/data/plugins/project/project/pkg-win/nsis-3.11/Plugins/x64-ansi/ExecDos.dll

File renamed without changes.

‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x64-unicode/ExecDos.dll renamed to ‎app/data/plugins/project/project/pkg-win/nsis-3.11/Plugins/x64-unicode/ExecDos.dll

File renamed without changes.

‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-ansi/ExecDos.dll renamed to ‎app/data/plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-ansi/ExecDos.dll

File renamed without changes.

‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-ansi/ShellLink.dll renamed to ‎app/data/plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-ansi/ShellLink.dll

File renamed without changes.

‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-unicode/ExecDos.dll renamed to ‎app/data/plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-unicode/ExecDos.dll

File renamed without changes.

‎plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-unicode/ShellLink.dll renamed to ‎app/data/plugins/project/project/pkg-win/nsis-3.11/Plugins/x86-unicode/ShellLink.dll

File renamed without changes.

‎plugins/project/project/pkg-win/nsis-3.11/nsis-3.11-setup.exe renamed to ‎app/data/plugins/project/project/pkg-win/nsis-3.11/nsis-3.11-setup.exe

File renamed without changes.

‎plugins/project/project/pkg-win/pkg-win-nsis.bat renamed to ‎app/data/plugins/project/project/pkg-win/pkg-win-nsis.bat

File renamed without changes.

‎plugins/project/project/pkg-win/pkg-win-nsis.nsi renamed to ‎app/data/plugins/project/project/pkg-win/pkg-win-nsis.nsi

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,21 @@ Function .onInit
8888
FunctionEnd
8989

9090
;------------ Installer Sections ------------
91+
Section "ShortCuts"
92+
; Add Uninstaller to Start Menu (Optional)
93+
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
94+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\bin64\Uninstall.exe"
95+
96+
; Add program to Start Menu && Desktop && QuickLaunch && Add runas authority to shortcut
97+
SetShellVarContext all
98+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
99+
;ShellLink::SetRunAsAdministrator "$SMPROGRAMS\Porter\${PRODUCT_NAME}.lnk"
100+
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
101+
;ShellLink::SetRunAsAdministrator "$DESKTOP\${PRODUCT_NAME}.lnk"
102+
CreateShortCut "$QUICKLAUNCH\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
103+
;ShellLink::SetRunAsAdministrator "$QUICKLAUNCH\${PRODUCT_NAME}.lnk"
104+
SectionEnd
105+
91106
Section "${PRODUCT_NAME}" SEC_MAIN ;Installer
92107
SectionIn RO
93108
SetOutPath "$INSTDIR"
@@ -103,19 +118,6 @@ Section "${PRODUCT_NAME}" SEC_MAIN ;Installer
103118
; Create Uninstaller
104119
WriteUninstaller "$INSTDIR\bin64\Uninstall.exe"
105120

106-
; Add Uninstaller to Start Menu (Optional)
107-
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
108-
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\bin64\Uninstall.exe"
109-
110-
; Add program to Start Menu && Desktop && QuickLaunch && Add runas authority to shortcut
111-
;SetShellVarContext all
112-
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
113-
;ShellLink::SetRunAsAdministrator "$SMPROGRAMS\Porter\${PRODUCT_NAME}.lnk"
114-
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
115-
;ShellLink::SetRunAsAdministrator "$DESKTOP\${PRODUCT_NAME}.lnk"
116-
CreateShortCut "$QUICKLAUNCH\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
117-
;ShellLink::SetRunAsAdministrator "$QUICKLAUNCH\${PRODUCT_NAME}.lnk"
118-
119121
; Register the software in Add/Remove Programs
120122
SetRegView 64
121123
; RightAction add to HKEY_CLASSES_ROOT
@@ -185,11 +187,12 @@ FunctionEnd
185187
;------------ Uninstaller Section ------------
186188
Section "Uninstall"
187189
; Remove Shortcuts
188-
;SetShellVarContext all
190+
SetShellVarContext all
189191
Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
190192
Delete "$QUICKLAUNCH\${PRODUCT_NAME}.lnk"
191193
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
192194
Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk"
195+
RMDir /r "$SMPROGRAMS\${PRODUCT_NAME}"
193196

194197
; Remove Registry Entries
195198
SetRegView 64
@@ -212,6 +215,5 @@ Section "Uninstall"
212215
;Delete "$INSTDIR\Uninstall.exe"
213216

214217
; Remove Directory
215-
RMDir /r "$SMPROGRAMS\${PRODUCT_NAME}"
216218
RMDir /r "$INSTDIR\.."
217219
SectionEnd

‎plugins/project/project/pkg-win/vs-env.bat renamed to ‎app/data/plugins/project/project/pkg-win/vs-env.bat

File renamed without changes.

‎plugins/project/project/project.py renamed to ‎app/data/plugins/project/project/project.py

File renamed without changes.

‎plugins/project/project/resource/fail.png renamed to ‎app/data/plugins/project/project/resource/fail.png

File renamed without changes.

‎plugins/project/project/resource/loading.gif renamed to ‎app/data/plugins/project/project/resource/loading.gif

File renamed without changes.

‎plugins/project/project/resource/logo.ico renamed to ‎app/data/plugins/project/project/resource/logo.ico

File renamed without changes.

‎plugins/project/project/resource/uninstall.ico renamed to ‎app/data/plugins/project/project/resource/uninstall.ico

File renamed without changes.

‎plugins/project/project/resource/warning.png renamed to ‎app/data/plugins/project/project/resource/warning.png

File renamed without changes.

‎plugins/project/project/template/CMakeLists.txt.PROJ renamed to ‎app/data/plugins/project/project/template/CMakeLists.txt.PROJ

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ if(WIN)
1515
# set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJ_ROOT}/bin64/lib")
1616
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJ_ROOT}/lib")
1717
elseif(LINUX)
18-
set(CMAKE_INSTALL_PREFIX "${PROJ_ROOT}/bin64/bin64")
19-
set(EXECUTABLE_OUTPUT_PATH "${PROJ_ROOT}/bin64/bin64")
20-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJ_ROOT}/bin64/bin64")
18+
set(CMAKE_INSTALL_PREFIX "${PROJ_ROOT}/bin64")
19+
set(EXECUTABLE_OUTPUT_PATH "${PROJ_ROOT}/bin64")
20+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJ_ROOT}/bin64")
2121
else()
2222
set(CMAKE_INSTALL_PREFIX "${PROJ_ROOT}/bin64")
2323
set(EXECUTABLE_OUTPUT_PATH "${PROJ_ROOT}/bin64")
@@ -143,9 +143,9 @@ if(NOT ANDROID)
143143
)
144144
endif(NOT ANDROID)
145145

146-
# set(PLUGIN_DIR ${PROJ_ROOT}/../plugins)
146+
# set(PLUGIN_DIR ${PROJ_ROOT}/plugins)
147147
# File(GLOB_RECURSE PLUGIN_FILEs ${PLUGIN_DIR}/*.*)
148-
# list(FILTER PLUGIN_FILEs EXCLUDE REGEX "${PROJ_ROOT}/../plugins/templates/*")
148+
# list(FILTER PLUGIN_FILEs EXCLUDE REGEX "${PLUGIN_DIR}/templates/*")
149149
# if(NOT ANDROID)
150150
# source_group(
151151
# TREE ${PLUGIN_DIR}

‎plugins/project/project/template/deps.cmake renamed to ‎app/data/plugins/project/project/template/deps.cmake

File renamed without changes.

‎plugins/project/project/template/src.cmake.GROUP renamed to ‎app/data/plugins/project/project/template/src.cmake.GROUP

File renamed without changes.

‎plugins/project/run.py renamed to ‎app/data/plugins/project/run.py

File renamed without changes.

‎plugins/pytool/README.md renamed to ‎app/data/plugins/pytool/README.md

‎plugins/pytool/pyt_file.py renamed to ‎app/data/plugins/pytool/pyt_file.py

File renamed without changes.

‎plugins/pytool/pyt_json.py renamed to ‎app/data/plugins/pytool/pyt_json.py

File renamed without changes.

‎plugins/pytool/pyt_pip.py renamed to ‎app/data/plugins/pytool/pyt_pip.py

File renamed without changes.

‎plugins/xcode/xcodeproj/XCode-SDK.rb renamed to ‎app/data/plugins/xcode/xcodeproj/XCode-SDK.rb

File renamed without changes.

‎plugins/xcode/xcodeproj/xcodelib/xcode-build_phases.rb renamed to ‎app/data/plugins/xcode/xcodeproj/xcodelib/xcode-build_phases.rb

File renamed without changes.

‎plugins/xcode/xcodeproj/xcodelib/xcode-build_settings.rb renamed to ‎app/data/plugins/xcode/xcodeproj/xcodelib/xcode-build_settings.rb

File renamed without changes.

‎plugins/xcode/xcodeproj/xcodelib/xcode-cmake.rb renamed to ‎app/data/plugins/xcode/xcodeproj/xcodelib/xcode-cmake.rb

File renamed without changes.

‎plugins/xcode/xcodeproj/xcodelib/xcode-proj.rb renamed to ‎app/data/plugins/xcode/xcodeproj/xcodelib/xcode-proj.rb

File renamed without changes.

‎plugins/xcode/xcodeproj/xcodelib/xcodeproj.md renamed to ‎app/data/plugins/xcode/xcodeproj/xcodelib/xcodeproj.md

‎app/pkg-win-nsis.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ start /wait %QT_HOME%\bin\windeployqt.exe -qmldir %QT_HOME%/qml %BIN_DIR%\%PROJ_
2121

2222
call %SCRIPT_DIR%\vs-env.bat
2323

24-
set VERSION="1.1.4.0"
24+
set VERSION="1.1.5.0"
2525
echo packaging %VERSION% for "x64"
2626
makensis /INPUTCHARSET UTF8 /DPRODUCT_NAME=%PROJ_NAME% /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x64" %SCRIPT_DIR%/pkg-win-nsis.nsi
2727
echo packaging %VERSION% for "x86"

‎app/run_android.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ md %BUILD_DIR%
2828
if exist %BIN_DIR% rd /s /q %BIN_DIR%
2929

3030
:: clean py cache
31-
SET PLUGIN_DIR=%ROOT_DIR%\..\plugins
31+
SET PLUGIN_DIR=%ROOT_DIR%\app\data\plugins
3232
echo PLUGIN_DIR = %PLUGIN_DIR%
3333
for /f "delims=" %%i in ('dir /ad/b/s "%PLUGIN_DIR%"') do (
3434
if exist %%i\.DS_Store rd /s /q %%i\.DS_Store
@@ -57,4 +57,4 @@ if not exist %BUILD_DIR%\%ANDROID_ABI% md %BUILD_DIR%\%ANDROID_ABI%
5757
copy %BUILD_DIR%\*.so %BUILD_DIR%\%ANDROID_ABI%\
5858

5959
echo. & pause
60-
60+

‎app/run_android.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ function clean_plugins() {
9393
do_mkdir
9494
clean_plugins
9595
do_ninja_build
96-
96+

‎app/run_ios.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ if [[ `uname` == "Darwin" ]]; then
7070
do_open
7171
fi
7272
fi
73-
73+

‎app/run_unix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ function clean_plugins() {
8585
do_mkdir
8686
clean_plugins
8787
do_build $1
88-
88+

‎app/run_win.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ echo QT_INSTALL_DIR = %QT_INSTALL_DIR%
4242
echo PY_INSTALL_DIR = %PY_INSTALL_DIR%
4343

4444
:: clean py cache
45-
SET PLUGIN_DIR=%ROOT_DIR%\..\plugins
45+
SET PLUGIN_DIR=%ROOT_DIR%\app\data\plugins
4646
echo PLUGIN_DIR = %PLUGIN_DIR%
4747
for /f "delims=" %%i in ('dir /ad/b/s "%PLUGIN_DIR%"') do (
4848
if exist %%i\.DS_Store rd /s /q %%i\.DS_Store

‎app/scripts/cmake/cmake-core/core_func.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,17 @@ endfunction(APP_ADD_RES_RECURSE_PLAIN)
9696

9797
# e.g.
9898
# set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
99-
# set(PLUGIN_DIR ${PROJ_ROOT}/../plugins)
100-
# File(GLOB_RECURSE PLUGIN_FILEs ${PLUGIN_DIR}/*.*)
99+
# set(DATA_DIR ${PROJ_ROOT}/data)
100+
# File(GLOB_RECURSE DATA_FILEs ${DATA_DIR}/*.*)
101101
# if(NOT ANDROID)
102102
# source_group(
103-
# TREE ${PLUGIN_DIR}
103+
# TREE ${DATA_DIR}
104104
# PREFIX "plugins"
105-
# FILES ${PLUGIN_FILEs}
105+
# FILES ${DATA_FILEs}
106106
# )
107107
# endif(NOT ANDROID)
108-
# add_executable(${PROJECT_NAME} ${OS_BUNDLE} ${SRC_FILES} ${PLUGIN_FILEs})
109-
# APP_ADD_RES_RECURSE("${PLUGIN_DIR}/" "data/plugins/" "${PLUGIN_DIR}/*.*")
108+
# add_executable(${PROJECT_NAME} ${OS_BUNDLE} ${SRC_FILES} ${DATA_FILEs})
109+
# APP_ADD_RES_RECURSE("${DATA_DIR}/" "data/" "${DATA_DIR}/*.*")
110110
function(APP_ADD_RES_RECURSE src_dir dst_dir src_files)
111111
get_filename_component(src_dir ${src_dir} ABSOLUTE)
112112
message("APP_ADD_RES_RECURSE() src_dir = ${src_dir} ; dst_dir = ${dst_dir} ; src_files = ${src_files} ")

‎app/scripts/pkg-rpm/SPECS/app.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: _PROJ_NAME_
2-
Version: 1.1.4.0
2+
Version: 1.1.5.0
33
Release: 1%{?dist}
44
Summary: Client Application
55
License: ""

‎app/scripts/pkg-win/Note.md

Lines changed: 3 additions & 1 deletion

‎app/scripts/pkg-win/pkg-win-nsis.nsi

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,21 @@ Function .onInit
8888
FunctionEnd
8989

9090
;------------ Installer Sections ------------
91+
Section "ShortCuts"
92+
; Add Uninstaller to Start Menu (Optional)
93+
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
94+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\bin64\Uninstall.exe"
95+
96+
; Add program to Start Menu && Desktop && QuickLaunch && Add runas authority to shortcut
97+
SetShellVarContext all
98+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
99+
;ShellLink::SetRunAsAdministrator "$SMPROGRAMS\Porter\${PRODUCT_NAME}.lnk"
100+
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
101+
;ShellLink::SetRunAsAdministrator "$DESKTOP\${PRODUCT_NAME}.lnk"
102+
CreateShortCut "$QUICKLAUNCH\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
103+
;ShellLink::SetRunAsAdministrator "$QUICKLAUNCH\${PRODUCT_NAME}.lnk"
104+
SectionEnd
105+
91106
Section "${PRODUCT_NAME}" SEC_MAIN ;Installer
92107
SectionIn RO
93108
SetOutPath "$INSTDIR"
@@ -103,19 +118,6 @@ Section "${PRODUCT_NAME}" SEC_MAIN ;Installer
103118
; Create Uninstaller
104119
WriteUninstaller "$INSTDIR\bin64\Uninstall.exe"
105120

106-
; Add Uninstaller to Start Menu (Optional)
107-
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
108-
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\bin64\Uninstall.exe"
109-
110-
; Add program to Start Menu && Desktop && QuickLaunch && Add runas authority to shortcut
111-
;SetShellVarContext all
112-
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
113-
;ShellLink::SetRunAsAdministrator "$SMPROGRAMS\Porter\${PRODUCT_NAME}.lnk"
114-
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
115-
;ShellLink::SetRunAsAdministrator "$DESKTOP\${PRODUCT_NAME}.lnk"
116-
CreateShortCut "$QUICKLAUNCH\${PRODUCT_NAME}.lnk" "$INSTDIR\bin64\${PRODUCT_NAME}.exe"
117-
;ShellLink::SetRunAsAdministrator "$QUICKLAUNCH\${PRODUCT_NAME}.lnk"
118-
119121
; Register the software in Add/Remove Programs
120122
SetRegView 64
121123
; RightAction add to HKEY_CLASSES_ROOT
@@ -185,11 +187,12 @@ FunctionEnd
185187
;------------ Uninstaller Section ------------
186188
Section "Uninstall"
187189
; Remove Shortcuts
188-
;SetShellVarContext all
190+
SetShellVarContext all
189191
Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
190192
Delete "$QUICKLAUNCH\${PRODUCT_NAME}.lnk"
191193
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
192194
Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk"
195+
RMDir /r "$SMPROGRAMS\${PRODUCT_NAME}"
193196

194197
; Remove Registry Entries
195198
SetRegView 64
@@ -212,6 +215,5 @@ Section "Uninstall"
212215
;Delete "$INSTDIR\Uninstall.exe"
213216

214217
; Remove Directory
215-
RMDir /r "$SMPROGRAMS\${PRODUCT_NAME}"
216218
RMDir /r "$INSTDIR\.."
217219
SectionEnd

0 commit comments

Comments
 (0)