work save

Red_Panda_CPP.pro

@@ -40,9 +40,11 @@ linux: {
 win32: {
     !isEmpty(PREFIX) {
         target.path = $${PREFIX}
+		QMAKE_SUBSTITUTES += windows/installer-scripts/config.nsh.in
 
         resources.path = $${PREFIX}
-        resources.files += templates
+        resources.files += windows/templates
+        resources.files += windows/installer-scripts/config.nsh
         resources.files += README.md
         resources.files += NEWS.md
         resources.files += LICENSE

astyle/astyle.pro

@@ -24,7 +24,7 @@ isEmpty(PREFIX) {
 }
 
 win32: {
-    !isEmpty(BUILD_MSYS) {
+    !isEmpty(PREFIX) {
         target.path = $${PREFIX}
     }
 }

packages/msys/build.sh

@@ -7,7 +7,8 @@ PATH="${GCC_DIR}/bin:${PATH}"
 QMAKE="${GCC_DIR}/qt5-static/bin/qmake"
 NSIS="/d/Program Files (x86)/NSIS/bin/makensis.exe"
 SOURCE_DIR=`pwd`
-MINGW64="/d/Program Files/RedPanda-CPP/MINGW64"
+MINGW64="/d/Program Files/RedPanda-CPP/MinGW64"
+MINGW32="/d/Program Files/RedPanda-CPP/MinGW32"
 
 test -z "${BUILD_DIR}" | mkdir "${BUILD_DIR}"
 test -z "${PACKAGE_DIR}" | mkdir "${PACKAGE_DIR}"
@@ -15,23 +16,28 @@ pushd .
 
 cd "${BUILD_DIR}"
 
-echo `pwd`
-
-"$QMAKE" PREFIX="${PACKAGE_DIR}" BUILD_MSYS=1 -o Makefile "${SOURCE_DIR}\Red_Panda_Cpp.pro" -r -spec win32-g++ 
+"$QMAKE" PREFIX="${PACKAGE_DIR}" -o Makefile "${SOURCE_DIR}\Red_Panda_Cpp.pro" -r -spec win32-g++ 
 make -j16
 make install
 popd
 
+#build install package
+cp "${PACKAGE_DIR}/config.nsh" .
+cp "${SOURCE_DIR}/windows/installer-scripts/redpanda-x64.nsi" .
+cp "${SOURCE_DIR}/windows/installer-scripts/lang.nsh" .
+
 pushd .
 cd "${PACKAGE_DIR}"
-mklink /j MinGW64 "${MINGW64}"
-cp "${SOURCE_DIR}\installer\devcpp-x64.nsi" build.nsi
-cp "${SOURCE_DIR}\installer\lang.nsh" .
-"${NSIS}" build.nsi
-rm -f lang.nsi
-rm -f build.nsi
+rm MinGW64
+ln -s "${MINGW64}" 
 
+"${NSIS}" /NOCD "${SOURCE_DIR}/redpanda-x64.nsi"
 popd
 
+rm -f lang.nsh
+rm -f config.nsh
+rm -f redpanda-x64.nsi
+
+
 
 

windows/installer-scripts/config.nsh.in

@@ -0,0 +1,7 @@
+####################################################################
+# Startup
+
+!define COMPILERNAME \"MinGW-w64 X86_64 GCC 10.3\"
+!define COMPILERFOLDER \"MinGW64\"
+!define DEVCPP_VERSION \"$${APP_VERSION}\"
+

windows/installer-scripts/lang.nsh

@@ -1,46 +1,46 @@
 /* English 1033 */
-LangString MessageAppName 1033 "Red Panda Dev-C++"
-LangString MessageSectionMain 1033 "The Red Panda Dev-C++ IDE (Integrated Development Environment)"
+LangString MessageAppName 1033 "Red Panda C++"
+LangString MessageSectionMain 1033 "The Red Panda C++ IDE (Integrated Development Environment)"
 LangString MessageSectionIcons 1033 "Various icons that you can use in your programs"
 LangString MessageSectionMinGW 1033 "The ${COMPILERNAME} compiler and associated tools, headers and libraries"
-LangString MessageSectionLangs  1033  "The Dev-C++ interface translated to different languages (other than English which is built-in)"
-LangString MessageSectionAssocs   1033    "Use Dev-C++ as the default application for opening these types of files"
-LangString MessageSectionShortcuts     1033     "Create shortcuts to Dev-C++ in various folders"
+LangString MessageSectionLangs  1033  "The  Red Panda C++ interface translated to different languages (other than English which is built-in)"
+LangString MessageSectionAssocs   1033    "Use  Red Panda C++ as the default application for opening these types of files"
+LangString MessageSectionShortcuts     1033     "Create shortcuts to  Red Panda C++ in various folders"
 LangString MessageSectionConfig   1033    "Remove all leftover configuration files from previous installs"
-LangString MessageUninstallText     1033     "This program will uninstall Red Panda Dev-C++, continue?"
-LangString MessageUninstallExisting    1033   "Red Panda Dev-C++ is already installed. $\n$\nClick OK to remove the  previous version or Cancel to cancel the installation." 
+LangString MessageUninstallText     1033     "This program will uninstall  Red Panda C++, continue?"
+LangString MessageUninstallExisting    1033   " Red Panda C++ is already installed. $\n$\nClick OK to remove the  previous version or Cancel to cancel the installation." 
 LangString MessageRemoveConfig    1033   "Do you want to remove all the remaining configuration files?" 
 LangString SectionMainName 1033  "Program files (required)"
 LangString SectionIconsName 1033  "Icon files"
 LangString SectionLangsName 1033  "Language files"
 LangString SectionMinGWName 1033  "${COMPILERNAME} compiler" 
-LangString SectionAssocsName 1033  "Associate files to Red Panda Dev-C++" 
+LangString SectionAssocsName 1033  "Associate files to  Red Panda C++" 
 LangString SectionAssocExtNameBegin 1033  "Associate" 
-LangString SectionAssocExtNameEnd 1033  "files to Red Panda Dev-C++" 
+LangString SectionAssocExtNameEnd 1033  "files to  Red Panda C++" 
 LangString SectionShortcutsName 1033  "Shortcuts" 
 LangString SectionMenuLaunchName 1033  "Create Start Menu shortcuts" 
 LangString SectionDesktopLaunchName 1033  "Create Desktop shortcut" 
 LangString SectionConfigName 1033  "Remove old configuration files" 
 
 /*  Simplified Chinese 2052 */
-LangString MessageAppName 2052 "小熊猫Dev-C++"
-LangString MessageSectionMain 2052 "小熊猫Dev-C++ IDE (集成开发环境)"
+LangString MessageAppName 2052 "小熊猫C++"
+LangString MessageSectionMain 2052 "小熊猫C++ IDE (集成开发环境)"
 LangString MessageSectionIcons 2052 "项目模板使用的图标文件"
 LangString MessageSectionMinGW 2052  "${COMPILERNAME} 编译器和相关的工具、头文件和库"
-LangString MessageSectionLangs     2052    "Dev-C++翻译文件"
-LangString MessageSectionAssocs      2052      "使用Dev-C++打开这些文件"
+LangString MessageSectionLangs     2052    "小熊猫C++翻译文件"
+LangString MessageSectionAssocs      2052      "使用小熊猫C++打开这些文件"
 LangString MessageSectionShortcuts      2052      "开始菜单和快捷方式"
 LangString MessageSectionConfig      2052      "删除之前安装遗留的所有配置文件"
-LangString MessageUninstallText      2052      "将要删除小熊猫Dev-C++, 是否继续?"
-LangString MessageUninstallExisting     2052    "本机上已经安装了旧版本小熊猫Dev-C++. $\n$\n点击'确定'以将其删除并继续，或者'取消'中止安装。" 
+LangString MessageUninstallText      2052      "将要删除小熊猫C++, 是否继续?"
+LangString MessageUninstallExisting     2052    "本机上已经安装了旧版本小熊猫C++. $\n$\n点击'确定'以将其删除并继续，或者'取消'中止安装。" 
 LangString MessageRemoveConfig     2052   "你想要删除所有的配置文件吗？" 
 LangString SectionMainName 2052  "程序文件 (必须)"
 LangString SectionIconsName 2052  "图标文件"
 LangString SectionLangsName 2052  "语言文件"
 LangString SectionMinGWName 2052  "${COMPILERNAME}编译器" 
-LangString SectionAssocsName 2052  "关联文件到小熊猫Dev-C++" 
+LangString SectionAssocsName 2052  "关联文件到小熊猫C++" 
 LangString SectionAssocExtNameBegin 2052  "将" 
-LangString SectionAssocExtNameEnd 2052  "文件关联到小熊猫Dev-C++" 
+LangString SectionAssocExtNameEnd 2052  "文件关联到小熊猫C++" 
 LangString SectionShortcutsName 2052  "快捷方式" 
 LangString SectionMenuLaunchName 2052  "创建开始菜单程序项" 
 LangString SectionDesktopLaunchName 2052  "创建桌面快捷方式" 

windows/installer-scripts/redpanda-x64.nsi

@@ -1,11 +1,9 @@
 ####################################################################
 # Startup
 
-!define COMPILERNAME "MinGW-w64 X86_64 GCC 10.3"
-!define COMPILERFOLDER "MinGW64"
-!define DEVCPP_VERSION "0.14"
-!define FINALNAME "RedPanda-Cpp.7.${DEVCPP_VERSION}.${COMPILERNAME}.Setup.exe"
-!define DISPLAY_NAME "Red Panda Dev-C++ 7 ${DEVCPP_VERSION}"
+!include "config.nsh"
+!define FINALNAME "RedPanda.C++.${DEVCPP_VERSION}.${COMPILERNAME}.Setup.exe"
+!define DISPLAY_NAME "Red Panda C++ ${DEVCPP_VERSION}"
 
 !include "MUI2.nsh"
 !include "lang.nsh"
@@ -98,8 +96,6 @@ Section "$(SectionMainName)" SectionMain
   SetOutPath $INSTDIR\Templates
   File /nonfatal /r "Templates\*"
 
-  SetOutPath $INSTDIR\Icons
-  File /nonfatal /r "Icons\*"
 SectionEnd
 
 Section "$(SectionMinGWName)" SectionMinGW
@@ -109,13 +105,6 @@ Section "$(SectionMinGWName)" SectionMinGW
   File /nonfatal /r "${COMPILERFOLDER}\*"
 SectionEnd
 
-Section "$(SectionIconsName)" SectionIcons
-  SectionIn 1 3
-  
-  SetOutPath $INSTDIR\Icons
-  File /nonfatal /r "Icons\*.*"
-SectionEnd
-
 ####################################################################
 # File association
 SubSection "$(SectionAssocsName)" SectionAssocs
@@ -271,7 +260,6 @@ SectionEnd
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 !insertmacro MUI_DESCRIPTION_TEXT ${SectionMain}        "$(MessageSectionMain)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SectionMinGW}      "$(MessageSectionMinGW)"
-!insertmacro MUI_DESCRIPTION_TEXT ${SectionIcons}      "$(MessageSectionIcons)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SectionShortcuts}   "$(MessageSectionShortcuts)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SectionAssocs}      "$(MessageSectionAssocs)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SectionConfig}      "$(MessageSectionConfig)"
@@ -475,7 +463,6 @@ Section "Uninstall"
   Delete "$INSTDIR\README.md"
 
   RMDir /r "$INSTDIR\Lang"
-  RMDir /r "$INSTDIR\Icons"
   RMDir /r "$INSTDIR\Templates"
   RMDir /r "$INSTDIR\MinGW32"
   RMDir /r "$INSTDIR\MinGW64"