update release.bat

Author: irascible

phoenix.pro

@@ -164,6 +164,13 @@ else {
 INCLUDEPATH += ../libgit2/include
 LIBGIT2LIB = ../libgit2-build
 win32 {
+    contains(QMAKE_TARGET.arch, x86_64) {
+            LIBGIT2LIB = $${LIBGIT2LIB}64
+    }
+    !contains(QMAKE_TARGET.arch, x86_64) {
+            LIBGIT2LIB = $${LIBGIT2LIB}32
+    }
+
     exists($$LIBGIT2LIB/git2.lib) {
         message("found libgit2 library")
     }

src/referencemodel/sqlitereferencemodel.cpp

@@ -923,7 +923,7 @@ bool SqliteReferenceModel::insertPart(ModelPart * modelPart, bool fullLoad) {
             }
 
             if (bail) {
-                DebugDialog::debug(QString("part path not in parts:%1").arg(path));
+                DebugDialog::debug(QString("part path not in parts:%1 %2 %3").arg(path).arg(prefix).arg(fullLoad));
                 return true;
             }
         }

tools/release_fritzing.bat

@@ -1,17 +1,24 @@
 echo off
 
+echo .
 echo you must start this script from the Visual Studio Command Line Window
-echo find this under the start menu at:
+echo find this under the start menu at (depending on your version of Visual Studio):
 echo     All Programs / Microsoft Visual Studio 2012 / Visual Studio Tools / Developer Command Prompt 
 echo for the 64-bit build, use the 64-bit prompt:
 echo     All Programs / Microsoft Visual Studio 2012 / Visual Studio Tools / VS2012 x64 Cross Tools Command Prompt
 echo.
 echo the script also assumes you have cloned the Fritzing git repository and are launching this script from within that repository
+
 echo.
 echo for a full release, run the script twice, once for a 64-built build, once for a 32-bit build
-echo you may need to change QTBIN to point to your Qt folder (once for 64-bit, once for 32-bit)
+echo you may need to change the script variable QTBIN to point to your Qt folder (once for 64-bit, once for 32-bit)
+echo.
+echo you may need to set the PATH in the script to your git for windows installation
+echo.
+echo you may need to change the script variable LIBGIT2 to find git2.dll
 echo.
 
+
 IF .%1 == . (
 	echo first parameter--release version--is missing, should be something like 0.8.6b
 	EXIT /B
@@ -22,13 +29,16 @@ IF .%2 == . (
 	EXIT /B
 )
 
+echo add the path for your git installation if it's not already there
+set PATH=%PATH%;"C:\Users\jonathan\AppData\Local\Programs\Git\bin";"C:\Users\jonathan\AppData\Local\Programs\Git\cmd"
+
 echo set the path to the qt sdk bin folder
 IF %2==64 (
-	set QTBIN=C:\Qt\Qt5.2.1-64bit\5.2.1\msvc2012_64\bin
+        set QTBIN=C:\Qt2\5.5\msvc2013_64\bin
 	set arch=""QMAKE_TARGET.arch=x86_64""
 ) ELSE (
 	IF %2==32 (
-		set QTBIN=C:\Qt\Qt5.2.1\5.2.1\msvc2012\bin
+                set QTBIN=C:\Qt-32bit\5.5\msvc2013\bin
 		set arch=.
 	) ELSE (
 		echo second parameter--target architecture--should be either "32" for a 32-bit build or "64" for a 64-bit build
@@ -47,6 +57,8 @@ echo.
 cd /d %~dp0
 cd ..
 
+set LIBGIT2=%~dp0..\..\libgit2-build%2
+
 rem set environment variable for qmake phoenix.pro
 set RELEASE_SCRIPT="release_script"	
 
@@ -56,6 +68,11 @@ echo building fritzing
 nmake release
 
 set DESTDIR=..\release%2
+rem get the absolute path of DESTDIR
+pushd %DESTDIR%
+set DESTDIR=%CD%
+popd
+
 set RELEASE_NAME=%DESTDIR%\forzip\fritzing.%1.%2.pc
 
 echo setting up deploy folder. ignore any "The system cannot find ..." messages
@@ -64,13 +81,14 @@ rmdir %DESTDIR%\forzip /s /q
 if exist %RELEASE_NAME%.zip (
 	del %RELEASE_NAME%.zip
 )
+
 mkdir %DESTDIR%\deploy
 mkdir %DESTDIR%\forzip
 mkdir %DESTDIR%\deploy\platforms
 mkdir %DESTDIR%\deploy\lib
-mkdir  %DESTDIR%\deploy\lib\imageformats
-mkdir  %DESTDIR%\deploy\lib\sqldrivers
-mkdir  %DESTDIR%\deploy\lib\printsupport
+mkdir %DESTDIR%\deploy\lib\imageformats
+mkdir %DESTDIR%\deploy\lib\sqldrivers
+mkdir %DESTDIR%\deploy\lib\printsupport
 echo deploy folder ready.  any further "The system cannot find ..." messages represent significant problems with the script
 echo.
 
@@ -87,60 +105,42 @@ copy %QTBIN%\Qt5Widgets.dll %DESTDIR%\deploy\Qt5Widgets.dll
 copy %QTBIN%\Qt5Xml.dll %DESTDIR%\deploy\Qt5Xml.dll
 copy %QTBIN%\Qt5SerialPort.dll %DESTDIR%\deploy\Qt5SerialPort.dll
 
-
-copy %QTBIN%\icudt51.dll %DESTDIR%\deploy\icudt51.dll
-copy %QTBIN%\icuin51.dll %DESTDIR%\deploy\icuin51.dll
-copy %QTBIN%\icuuc51.dll %DESTDIR%\deploy\icuuc51.dll
+xcopy /q %QTBIN%\icu*.dll %DESTDIR%\deploy /E  /I
 
 copy %QTBIN%\..\plugins\imageformats\qjpeg.dll %DESTDIR%\deploy\lib\imageformats\qjpeg.dll
 copy %QTBIN%\..\plugins\sqldrivers\qsqlite.dll %DESTDIR%\deploy\lib\sqldrivers\qsqlite.dll
 copy %QTBIN%\..\plugins\platforms\qwindows.dll %DESTDIR%\deploy\platforms\qwindows.dll
 copy %QTBIN%\..\plugins\printsupport\windowsprintersupport.dll  %DESTDIR%\deploy\lib\printsupport\windowsprintersupport.dll 
-copy %QTBIN%\..\plugins\platforms\qwindows.dll %DESTDIR%\deploy\platforms\qwindows.dll
 
-echo copying bins, parts, sketches, translations, pdb, help
+echo copying git2.dll from %LIBGIT2%
+copy %LIBGIT2%\git2.dll  %DESTDIR%\deploy\git2.dll
+
+echo copying sketches, translations, help, README, LICENSE
 echo.
 
 copy  %DESTDIR%\Fritzing.exe %DESTDIR%\deploy\Fritzing.exe
 
 xcopy /q .\translations %DESTDIR%\deploy\translations /E  /I
 
-xcopy /q .\bins %DESTDIR%\deploy\bins /E  /I
-
 xcopy /q .\sketches %DESTDIR%\deploy\sketches /E  /I
 
-move .\parts\core\*.* .\pdb\core\
-move .\parts\obsolete\*.* .\pdb\obsolete\
-move .\parts\contrib\*.* .\pdb\contrib\
-move .\parts\user\*.* .\pdb\user\
-
-xcopy /q .\parts %DESTDIR%\deploy\parts /E  /I
-xcopy /q .\pdb %DESTDIR%\deploy\pdb /E  /I
-
-move .\pdb\core\*.* .\parts\core\
-move .\pdb\obsolete\*.* .\parts\obsolete\
-move .\pdb\user\*.* .\parts\user\
-move .\pdb\contrib\*.* .\parts\contrib\
-xcopy /q .\parts\core\placeholder.txt .\pdb\core\
-xcopy /q .\parts\core\placeholder.txt .\pdb\obsolete\
-xcopy /q .\parts\core\placeholder.txt .\pdb\user\
-xcopy /q .\parts\core\placeholder.txt .\pdb\contrib\
-
 xcopy /q .\help %DESTDIR%\deploy\help /E  /I
-copy .\README.txt %DESTDIR%\deploy\README.txt
+
+copy .\readme.md %DESTDIR%\deploy\readme.md
 copy .\LICENSE.GPL2 %DESTDIR%\deploy\LICENSE.GPL2
 copy .\LICENSE.GPL3 %DESTDIR%\deploy\LICENSE.GPL3
 copy .\LICENSE.CC-BY-SA %DESTDIR%\deploy\LICENSE.CC-BY-SA
 echo removing empty translation files
 echo.
 
-
-
 del %DESTDIR%\deploy\translations\*.ts
 
 set CURRENTDIR=%cd%
 cd %DESTDIR%
 cd deploy
+
+git clone --depth 1 https://github.com/fritzing/fritzing-parts.git
+
 del/s placeholder.txt
 cd translations
 for /f "usebackq delims=;" %%A in (`dir /b *.qm`) do If %%~zA LSS 1024 del "%%A"
@@ -152,15 +152,20 @@ IF %2==32 (
 )
 
 echo copying vc redist files
+echo you may have to rename these based on your version of visual studio: 2012 is "110"; 2013 is "120"
 IF %2==32 (
 	set XFOLDER=x86
 ) ELSE (
 	set XFOLDER=x64
 )
 
-copy  "%VCINSTALLDIR%redist\%XFOLDER%\Microsoft.VC110.CRT\msvcp110.dll" %DESTDIR%\deploy\msvcp110.dll
-copy  "%VCINSTALLDIR%redist\%XFOLDER%\Microsoft.VC110.CRT\msvcr110.dll" %DESTDIR%\deploy\msvcr110.dll
+copy  "%VCINSTALLDIR%redist\%XFOLDER%\Microsoft.VC120.CRT\msvcp120.dll" %DESTDIR%\deploy\msvcp120.dll
+copy  "%VCINSTALLDIR%redist\%XFOLDER%\Microsoft.VC120.CRT\msvcr120.dll" %DESTDIR%\deploy\msvcr120.dll
+
+echo run fritzing to create parts.db
+%DESTDIR%\deploy\Fritzing.exe -pp %DESTDIR%\deploy\fritzing-parts -db %DESTDIR%\deploy\fritzing-parts\parts.db
 
+echo moving deploy to %RELEASE_NAME%
 move %DESTDIR%\deploy %RELEASE_NAME%
 
 echo create zip file