Skip to content

Commit

Permalink
Fix: 2021-07-22
Browse files Browse the repository at this point in the history
  • Loading branch information
horsicq committed Jul 22, 2021
1 parent e6675ca commit ddfcde9
Show file tree
Hide file tree
Showing 21 changed files with 3,197 additions and 133 deletions.
2 changes: 1 addition & 1 deletion Formats
Submodule Formats updated 2 files
+31 −0 xbinary.cpp
+2 −0 xbinary.h
2 changes: 1 addition & 1 deletion SpecAbstract
33 changes: 33 additions & 0 deletions build_dpkg.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/bin/bash -x
export QMAKE_PATH=/usr/bin/qmake

export X_SOURCE_PATH=$PWD
export X_BUILD_NAME=nfd_linux_portable
export X_RELEASE_VERSION=$(cat "release_version.txt")

source build_tools/linux.sh

check_file $QMAKE_PATH

if [ -z "$X_ERROR" ]; then
make_init
make_build "$X_SOURCE_PATH/NFD_source.pro"

check_file "$X_SOURCE_PATH/build/release/nfd"
if [ -z "$X_ERROR" ]; then
create_deb_app_dir nfd

#cp -f $X_SOURCE_PATH/LICENSE $X_SOURCE_PATH/release/$X_BUILD_NAME/
cp -f $X_SOURCE_PATH/DEBIAN/control $X_SOURCE_PATH/release/$X_BUILD_NAME/DEBIAN/
sed -i "s/#VERSION#/$X_RELEASE_VERSION/" $X_SOURCE_PATH/release/$X_BUILD_NAME/DEBIAN/control
sed -i "s/#ARCH#/$X_ARCHITECTURE/" $X_SOURCE_PATH/release/$X_BUILD_NAME/DEBIAN/control
cp -f $X_SOURCE_PATH/build/release/nfd $X_SOURCE_PATH/release/$X_BUILD_NAME/usr/bin/
cp -f $X_SOURCE_PATH/DEBIAN/nfd.desktop $X_SOURCE_PATH/release/$X_BUILD_NAME/usr/share/applications/
sed -i "s/#VERSION#/$X_RELEASE_VERSION/" $X_SOURCE_PATH/release/$X_BUILD_NAME/usr/share/applications/nfd.desktop
cp -Rf $X_SOURCE_PATH/DEBIAN/hicolor/ $X_SOURCE_PATH/release/$X_BUILD_NAME/usr/share/icons/

make_deb
mv $X_SOURCE_PATH/release/$X_BUILD_NAME.deb $X_SOURCE_PATH/release/xopcodecalc_${X_RELEASE_VERSION}-${X_REVISION}_${X_ARCHITECTURE}.deb
make_clear
fi
fi
114 changes: 26 additions & 88 deletions build_mac.sh
Original file line number Diff line number Diff line change
@@ -1,99 +1,37 @@
#!/bin/sh -x
QT_PATH=$HOME/Qt/5.15.2/clang_64
RELEASE_VERSION=$(cat "release_version.txt")
echo $RELEASE_VERSION
SOURCE_PATH=$PWD
export QMAKE_PATH=$HOME/Qt/5.15.2/clang_64/bin/qmake

BUILD_NAME=nfd_mac_portable
GUIEXE=nfd
CONEXE=nfdc
export X_SOURCE_PATH=$PWD
export X_BUILD_NAME=nfd_mac_portable
export X_RELEASE_VERSION=$(cat "release_version.txt")

cd $SOURCE_PATH
source build_tools/mac.sh

rm -rf build
check_file $QMAKE_PATH

function makeproject
{
cd $SOURCE_PATH/$1

$QT_PATH/bin/qmake $1.pro -spec macx-clang CONFIG+=x86_64
make -f Makefile clean
make -f Makefile
if [ -z "$X_ERROR" ]; then
make_init
make_build "$X_SOURCE_PATH/NFD_source.pro"

rm -rf Makefile
rm -rf Makefile.Release
rm -rf Makefile.Debug
rm -rf object_script.*
check_file "$X_SOURCE_PATH/build/release/nfd.app/Contents/MacOS/nfd"
if [ -z "$X_ERROR" ]; then
cp -R "$X_SOURCE_PATH/build/release/nfd.app" "$X_SOURCE_PATH/release/$X_BUILD_NAME"

cd $SOURCE_PATH
}
mkdir -p $X_SOURCE_PATH/release/$X_BUILD_NAME/nfd.app/Contents/Resources/signatures

makeproject build_libs
makeproject gui_source
makeproject console_source
fiximport "$X_SOURCE_PATH/build/release/nfd.app/Contents/MacOS/nfd"

mkdir -p release
rm -rf release/$BUILD_NAME
mkdir -p release/$BUILD_NAME

cp -R $SOURCE_PATH/build/release/$GUIEXE.app $SOURCE_PATH/release/$BUILD_NAME
cp -R $SOURCE_PATH/build/release/$CONEXE $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/MacOS/
mkdir $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/PlugIns

function fixlibrary
{
install_name_tool -change @rpath/$1.framework/Versions/5/$1 @executable_path/../Frameworks/$1.framework/Versions/5/$1 $2
}

function fiximport
{
fixlibrary QtWidgets $1
fixlibrary QtGui $1
fixlibrary QtCore $1
fixlibrary QtDBus $1
fixlibrary QtPrintSupport $1
}

function copylibrary
{
mkdir $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/Frameworks
mkdir $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/Frameworks/$1.framework
mkdir $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/Frameworks/$1.framework/Versions
mkdir $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/Frameworks/$1.framework/Versions/5

cp -R $QT_PATH/lib/$1.framework/Versions/5/$1 $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/Frameworks/$1.framework/Versions/5

install_name_tool -id @executable_path/../Frameworks/$1.framework/Versions/5/$1 $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/Frameworks/$1.framework/Versions/5/$1
fiximport $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/Frameworks/$1.framework/Versions/5/$1
}

function copyplugin
{
mkdir $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/PlugIns/$1/
cp -R $QT_PATH/plugins/$1/$2.dylib $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/PlugIns/$1/

install_name_tool -id @executable_path/../PlugIns/$1/$2.dylib $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/PlugIns/$1/$2.dylib
fiximport $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/PlugIns/$1/$2.dylib
}

fiximport $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/MacOS/$GUIEXE
fiximport $SOURCE_PATH/release/$BUILD_NAME/$GUIEXE.app/Contents/MacOS/$CONEXE

copylibrary QtWidgets
copylibrary QtGui
copylibrary QtCore
copylibrary QtDBus
copylibrary QtPrintSupport

copyplugin platforms libqcocoa
copyplugin platforms libqminimal
copyplugin platforms libqoffscreen

rm -rf $SOURCE_PATH/release/${BUILD_NAME}_${RELEASE_VERSION}.dmg
hdiutil create -format UDBZ -quiet -srcfolder $SOURCE_PATH/release/$BUILD_NAME $SOURCE_PATH/release/${BUILD_NAME}_${RELEASE_VERSION}.dmg
cd $SOURCE_PATH/release/
zip -r $SOURCE_PATH/release/${BUILD_NAME}_${RELEASE_VERSION}.zip ${BUILD_NAME}

rm -rf $SOURCE_PATH/release/$BUILD_NAME
deploy_qt_library QtWidgets nfd
deploy_qt_library QtGui nfd
deploy_qt_library QtCore nfd
deploy_qt_library QtDBus nfd
deploy_qt_library QtPrintSupport nfd

deploy_qt_plugin platforms libqcocoa nfd
deploy_qt_plugin platforms libqminimal nfd
deploy_qt_plugin platforms libqoffscreen nfd

make_release
make_clear
fi
fi
9 changes: 9 additions & 0 deletions build_msvc_win32.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set VSVARS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
set QMAKE_PATH="C:\Qt\5.15.2\msvc2019\bin\qmake.exe"
set SEVENZIP_PATH="C:\Program Files\7-Zip\7z.exe"

set X_SOURCE_PATH=%~dp0
set X_BUILD_NAME=nfd_win32_portable
set /p X_RELEASE_VERSION=<%X_SOURCE_PATH%\release_version.txt

call %X_SOURCE_PATH%\build_win_generic.cmd
9 changes: 9 additions & 0 deletions build_msvc_win64.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set VSVARS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
set QMAKE_PATH="C:\Qt\5.15.2\msvc2019_64\bin\qmake.exe"
set SEVENZIP_PATH="C:\Program Files\7-Zip\7z.exe"

set X_SOURCE_PATH=%~dp0
set X_BUILD_NAME=nfd_win64_portable
set /p X_RELEASE_VERSION=<%X_SOURCE_PATH%\release_version.txt

call %X_SOURCE_PATH%\build_win_generic.cmd
9 changes: 9 additions & 0 deletions build_msvc_winxp.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set VSVARS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"
set QMAKE_PATH="C:\Qt5.6.3\5.6.3\msvc2013\bin\qmake.exe"
set SEVENZIP_PATH="C:\Program Files\7-Zip\7z.exe"

set X_SOURCE_PATH=%~dp0
set X_BUILD_NAME=nfd_winxp_portable
set /p X_RELEASE_VERSION=<%X_SOURCE_PATH%\release_version.txt

call %X_SOURCE_PATH%\build_win_generic.cmd
26 changes: 26 additions & 0 deletions build_win_generic.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
call %X_SOURCE_PATH%\build_tools\windows.cmd make_init

IF NOT [%X_ERROR%] == [] goto exit

call %X_SOURCE_PATH%\build_tools\windows.cmd make_build %X_SOURCE_PATH%\NFD_source.pro

call %X_SOURCE_PATH%\build_tools\windows.cmd check_file %X_SOURCE_PATH%\build\release\nfd.exe

IF NOT [%X_ERROR%] == [] goto exit

call %X_SOURCE_PATH%\build_tools\windows.cmd check_file %X_SOURCE_PATH%\build\release\nfdc.exe

IF NOT [%X_ERROR%] == [] goto exit

copy %X_SOURCE_PATH%\build\release\nfd.exe %X_SOURCE_PATH%\release\%X_BUILD_NAME%\
copy %X_SOURCE_PATH%\build\release\nfdc.exe %X_SOURCE_PATH%\release\%X_BUILD_NAME%\

call %X_SOURCE_PATH%\build_tools\windows.cmd deploy_qt_library Qt5Widgets
call %X_SOURCE_PATH%\build_tools\windows.cmd deploy_qt_library Qt5Gui
call %X_SOURCE_PATH%\build_tools\windows.cmd deploy_qt_library Qt5Core
call %X_SOURCE_PATH%\build_tools\windows.cmd deploy_qt_plugin platforms qwindows
call %X_SOURCE_PATH%\build_tools\windows.cmd deploy_redist

call %X_SOURCE_PATH%\build_tools\windows.cmd make_release
:exit
call %X_SOURCE_PATH%\build_tools\windows.cmd make_clear
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.06
-----------------------------------------------------------------------
[+] Many bugs have been fixed.
#######################################################################
0.05
-----------------------------------------------------------------------
[+] Qt 5.15.2
Expand Down
Loading

0 comments on commit ddfcde9

Please sign in to comment.