Merge pull request xbmc#12328 from Rechi/mingwlibs

[windows][mingwlibs] change installdirectory

.gitignore

@@ -249,6 +249,7 @@ lib/cpluff/stamp-h1
 /project/BuildDependencies/bin/swig
 /project/BuildDependencies/bin/doxygen
 /project/BuildDependencies/bin/json-rpc
+/project/BuildDependencies/mingwlibs
 /project/BuildDependencies/x64
 /project/BuildDependencies/win32
 
@@ -265,16 +266,7 @@ lib/cpluff/stamp-h1
 /system/cec.dll
 /system/libxslt.dll
 /system/ssleay32.dll
-/system/avcodec-57.dll
-/system/avfilter-6.dll
-/system/avformat-57.dll
-/system/avutil-55.dll
-/system/postproc-54.dll
-/system/swscale-4.dll
-/system/swresample-2.dll
 /system/libxml2.dll
-/system/libdvdcss-2.dll
-/system/libdvdnav.dll
 /system/libass.dll
 /system/libbluray*
 /system/libcdio.dll
@@ -493,20 +485,10 @@ lib/cpluff/stamp-h1
 /xbmc/windowing/Makefile
 /xbmc/windowing/egl/Makefile
 
-# /lib/libdvd/
-/lib/libdvd/bin
-/lib/libdvd/include
-/lib/libdvd/lib
-/lib/libdvd/Makefile
-/lib/libdvd/share
-
 #/lib/win32
 /lib/win32/*.tar*
 /lib/win32/pax_global_header
 
-#/lib/win32/ffmpeg
-/lib/win32/ffmpeg/
-
 /lib/libUPnP/Makefile
 
 # /portable_data

cmake/installdata/windows/dlls.txt

@@ -2,3 +2,4 @@ system/*.dll .
 project/BuildDependencies/${ARCH}/bin/libbluray*.jar .
 project/Win32BuildSetup/dependencies/python27.dll .
 project/BuildDependencies/${ARCH}/bin/*.dll .
+project/BuildDependencies/mingwlibs/${ARCH}/bin/*.dll .

cmake/modules/FindLibDvd.cmake

@@ -203,7 +203,7 @@ if(NOT WIN32)
     endif()
 else()
   # Dynamically loaded on Windows
-  find_path(LIBDVD_INCLUDE_DIR dvdcss/dvdcss.h PATHS ${CMAKE_SOURCE_DIR}/lib/libdvd/include)
+  find_path(LIBDVD_INCLUDE_DIR dvdcss/dvdcss.h)
 
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(LibDvd REQUIRED_VARS LIBDVD_INCLUDE_DIR)

cmake/scripts/windows/ArchSetup.cmake

@@ -19,9 +19,8 @@ set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/WinMain.cpp)
 set(PRECOMPILEDHEADER_DIR ${PROJECT_BINARY_DIR}/${CORE_BUILD_CONFIG}/objs)
 
 set(CMAKE_SYSTEM_NAME Windows)
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/lib/win32)
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/lib/win32/ffmpeg)
-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/lib/win32/ffmpeg/bin)
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/mingwlibs/${ARCH})
+list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/mingwlibs/${ARCH}/bin)
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH})
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies)
 

tools/buildsteps/windows/buildffmpeg.sh

@@ -10,18 +10,7 @@ FFMPEG_DEFAULT_OPTS=""
 FFMPEG_TARGET_OS=mingw32
 
 do_loaddeps $FFMPEG_VERSION_FILE
-FFMPEGDESTDIR=/xbmc/lib/win32/$LIBNAME
-
-if [ "$(pathChanged $FFMPEGDESTDIR $FFMPEG_VERSION_FILE /xbmc/project/BuildDependencies/DownloadMingwBuildEnv.bat /xbmc/tools/buildsteps/windows)" == "0" ]
-then
-  cp $FFMPEGDESTDIR/bin/*.dll /xbmc/system/
-  if [ -f $BGPROCESSFILE ]; then
-    rm $BGPROCESSFILE
-  fi
-  exit
-else
-  git clean -dffx $FFMPEGDESTDIR
-fi
+FFMPEGDESTDIR=$PREFIX
 
 do_getFFmpegConfig() {
   if [[ -f "$FFMPEG_CONFIG_FILE" ]]; then
@@ -158,11 +147,4 @@ do_print_status "$LIBNAME-$VERSION (${BITS})" "$blue_color" "Configuring"
   --disable-static --enable-shared $FFMPEG_OPTS_SHARED \
   --extra-cflags="$extra_cflags" --extra-ldflags="$extra_ldflags"
 
-do_makelib &&
-cp $FFMPEGDESTDIR/bin/*.dll /xbmc/system/ &&
-tagSuccessFulBuild $FFMPEGDESTDIR $FFMPEG_VERSION_FILE /xbmc/project/BuildDependencies/DownloadMingwBuildEnv.bat /xbmc/tools/buildsteps/windows
-
-#remove the bgprocessfile for signaling the process end
-if [ -f $BGPROCESSFILE ]; then
-  rm $BGPROCESSFILE
-fi
+do_makelib

tools/buildsteps/windows/buildhelpers.sh

@@ -162,7 +162,7 @@ function getBuildHash ()
   shift 1
   local hashStr
   hashStr="$(git rev-list HEAD --max-count=1  -- $checkPath $@)"
-  hashStr="$hashStr $@ $BITS $tools"
+  hashStr="$hashStr $@ $BITS $TOOLS"
   echo $hashStr
 }
 

tools/buildsteps/windows/buildlibdvd.sh

@@ -3,22 +3,10 @@
 [[ -f buildhelpers.sh ]] &&
     source buildhelpers.sh
 
-LIBDVDPREFIX=/xbmc/lib/libdvd
+LIBDVDPREFIX=$PREFIX
 PKG_CONFIG_PATH=$LIBDVDPREFIX/lib/pkgconfig
 export PKG_CONFIG_PATH
 
-if [ "$(pathChanged $LIBDVDPREFIX /xbmc/tools/depends/target/libdvdcss/DVDCSS-VERSION /xbmc/tools/depends/target/libdvdread/DVDREAD-VERSION /xbmc/tools/depends/target/libdvdnav/DVDNAV-VERSION /xbmc/project/BuildDependencies/DownloadMingwBuildEnv.bat /xbmc/tools/buildsteps/windows)" == "0" ]
-then
-  cp "$LIBDVDPREFIX/bin/libdvdcss-2.dll" /xbmc/system/
-  cp $LIBDVDPREFIX/bin/libdvdnav.dll /xbmc/system/
-  if [ -f $BGPROCESSFILE ]; then
-    rm $BGPROCESSFILE
-  fi
-  exit
-else
-  git clean -dffx $LIBDVDPREFIX
-fi
-
 do_load_autoconf() {
   do_loaddeps $1
   do_clean_get $MAKEFLAGS
@@ -37,8 +25,7 @@ CC="gcc -static-libgcc" \
       --build="$MINGW_CHOST"
 do_makelib $MAKEFLAGS
 
-strip -S $LIBDVDPREFIX/bin/libdvdcss-2.dll &&
-cp "$LIBDVDPREFIX/bin/libdvdcss-2.dll" /xbmc/system/
+strip -S $LIBDVDPREFIX/bin/libdvdcss-2.dll
 
 #libdvdread
 do_load_autoconf /xbmc/tools/depends/target/libdvdread/DVDREAD-VERSION 
@@ -74,11 +61,4 @@ gcc \
    -static-libgcc
 
 strip -S $LIBDVDPREFIX/bin/libdvdnav.dll &&
-cp $LIBDVDPREFIX/bin/libdvdnav.dll /xbmc/system/ &&
-tagSuccessFulBuild $LIBDVDPREFIX /xbmc/tools/depends/target/libdvdcss/DVDCSS-VERSION /xbmc/tools/depends/target/libdvdread/DVDREAD-VERSION /xbmc/tools/depends/target/libdvdnav/DVDNAV-VERSION /xbmc/project/BuildDependencies/DownloadMingwBuildEnv.bat /xbmc/tools/buildsteps/windows
 do_print_status "libdvd (${BITS})" "$green_color" "Done"
-
-#remove the bgprocessfile for signaling the process end
-if [ -f $BGPROCESSFILE ]; then
-  rm $BGPROCESSFILE
-fi

tools/buildsteps/windows/download-msys2.bat

@@ -440,6 +440,8 @@ if %build32%==yes (
             echo.
             echo.BITS='32bit'
             echo.export BITS
+            echo.ARCHITECTURE='win32'
+            echo.export ARCHITECTURE
             )>>%instdir%\local32\etc\profile.local
         )
 
@@ -493,6 +495,8 @@ if %build64%==yes (
             echo.
             echo.BITS='64bit'
             echo.export BITS
+            echo.ARCHITECTURE='x64'
+            echo.export ARCHITECTURE
             )>>%instdir%\local64\etc\profile.local
         )
 

tools/buildsteps/windows/make-mingwlibs.sh

@@ -1,9 +1,8 @@
+[[ -f $(dirname $0)/buildhelpers.sh ]] &&
+    source $(dirname $0)/buildhelpers.sh
 
 Win32BuildSetup=/xbmc/project/Win32BuildSetup
 ERRORFILE=$Win32BuildSetup/errormingw
-NOPFILE=$Win32BuildSetup/noprompt
-MAKECLEANFILE=$Win32BuildSetup/makeclean
-BGPROCESSFILE=$Win32BuildSetup/bgprocess
 TOUCH=/bin/touch
 RM=/bin/rm
 NOPROMPT=0
@@ -48,20 +47,13 @@ checkfiles() {
   done
 }
 
-#start the process backgrounded
-runBackgroundProcess() {
-  $TOUCH $BGPROCESSFILE
-  echo "backgrounding: sh $1 $BGPROCESSFILE $TOOLS & (workdir: $(PWD))"
-  sh $1 $BGPROCESSFILE $targetBuild $TOOLS &
-  echo "waiting on bgprocess..."
-  while [ -f $BGPROCESSFILE ]; do
-    echo -n "."
-    sleep 5
-  done
-}
-
-
 buildProcess() {
+export PREFIX=/xbmc/project/BuildDependencies/mingwlibs/$ARCHITECTURE
+if [ "$(pathChanged $PREFIX /xbmc/tools/buildsteps/windows /xbmc/tools/depends/target/*/*-VERSION)" == "0" ]; then
+  return
+fi
+
+git clean -dffx $PREFIX
 cd /xbmc/tools/buildsteps/windows
 
 # compile our mingw dlls
@@ -79,8 +71,8 @@ echo -ne "\033]0;building FFmpeg $BITS\007"
 echo "-------------------------------------------------"
 echo " building FFmpeg $BITS"
 echo "-------------------------------------------------"
-runBackgroundProcess "./buildffmpeg.sh $MAKECLEAN"
-setfilepath /xbmc/system
+./buildffmpeg.sh
+setfilepath $PREFIX/bin
 checkfiles avcodec-57.dll avformat-57.dll avutil-55.dll postproc-54.dll swscale-4.dll avfilter-6.dll swresample-2.dll
 echo "-------------------------------------------------"
 echo " building of FFmpeg $BITS done..."
@@ -90,8 +82,7 @@ echo -ne "\033]0;building libdvd $BITS\007"
 echo "-------------------------------------------------"
 echo " building libdvd $BITS"
 echo "-------------------------------------------------"
-runBackgroundProcess "./buildlibdvd.sh $MAKECLEAN"
-setfilepath /xbmc/system
+./buildlibdvd.sh
 checkfiles libdvdcss-2.dll libdvdnav.dll
 echo "-------------------------------------------------"
 echo " building of libdvd $BITS done..."
@@ -103,6 +94,7 @@ echo "compile mingw libs $BITS done..."
 echo
 echo "-------------------------------------------------------------------------------"
 
+tagSuccessFulBuild $PREFIX /xbmc/tools/buildsteps/windows /xbmc/tools/depends/target/*/*-VERSION
 }
 
 run_builds() {

tools/buildsteps/windows/prepare-env.bat

@@ -13,8 +13,8 @@ IF EXIST %WORKSPACE%\project\Win32BuildSetup\BUILD_WIN32 rmdir %WORKSPACE%\proje
 rem we assume git in path as this is a requirement
 rem git clean the untracked files and directories
 rem but keep the downloaded dependencies
-ECHO running git clean -xffd -e "lib/libdvd" -e "lib/win32/ffmpeg" -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/Win32BuildSetup/dependencies/vcredist"
-git clean -xffd -e "lib/libdvd" -e "lib/win32/ffmpeg" -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/Win32BuildSetup/dependencies/vcredist"
+ECHO running git clean -xffd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/BuildDependencies/mingwlibs" -e "project/Win32BuildSetup/dependencies/vcredist"
+git clean -xffd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -e "project/BuildDependencies/mingwlibs" -e "project/Win32BuildSetup/dependencies/vcredist"
 
 rem cleaning additional directories
 ECHO delete build directories