Permalink
Browse files

Remove msvc files form bundled libusbx, since they are not needed to …

…build libusb-1.0.
  • Loading branch information...
1 parent 6bd7d74 commit 8f7fbe0a6269854a334c7e45b1283928830b396e @larskanis committed Jan 19, 2013
Showing with 4 additions and 4,552 deletions.
  1. +0 −1 .gitignore
  2. +4 −1 Rakefile
  3. +0 −30 ext/libusbx-1.0.14/msvc/config.h
  4. +0 −155 ext/libusbx-1.0.14/msvc/ddk_build.cmd
  5. +0 −170 ext/libusbx-1.0.14/msvc/fxload.vcxproj
  6. +0 −25 ext/libusbx-1.0.14/msvc/fxload.vcxproj.filters
  7. +0 −23 ext/libusbx-1.0.14/msvc/fxload_sources
  8. +0 −288 ext/libusbx-1.0.14/msvc/getopt.vcproj
  9. +0 −131 ext/libusbx-1.0.14/msvc/getopt.vcxproj
  10. +0 −26 ext/libusbx-1.0.14/msvc/getopt.vcxproj.filters
  11. +0 −20 ext/libusbx-1.0.14/msvc/getopt_sources
  12. +0 −295 ext/libusbx-1.0.14/msvc/inttypes.h
  13. +0 −71 ext/libusbx-1.0.14/msvc/libusb.dsw
  14. +0 −78 ext/libusbx-1.0.14/msvc/libusb_2005.sln
  15. +0 −74 ext/libusbx-1.0.14/msvc/libusb_2010.sln
  16. +0 −190 ext/libusbx-1.0.14/msvc/libusb_dll.dsp
  17. +0 −421 ext/libusbx-1.0.14/msvc/libusb_dll.vcproj
  18. +0 −166 ext/libusbx-1.0.14/msvc/libusb_dll.vcxproj
  19. +0 −69 ext/libusbx-1.0.14/msvc/libusb_dll.vcxproj.filters
  20. +0 −36 ext/libusbx-1.0.14/msvc/libusb_sources
  21. +0 −170 ext/libusbx-1.0.14/msvc/libusb_static.dsp
  22. +0 −346 ext/libusbx-1.0.14/msvc/libusb_static.vcproj
  23. +0 −150 ext/libusbx-1.0.14/msvc/libusb_static.vcxproj
  24. +0 −56 ext/libusbx-1.0.14/msvc/libusb_static.vcxproj.filters
  25. +0 −103 ext/libusbx-1.0.14/msvc/listdevs.dsp
  26. +0 −360 ext/libusbx-1.0.14/msvc/listdevs.vcproj
  27. +0 −165 ext/libusbx-1.0.14/msvc/listdevs.vcxproj
  28. +0 −14 ext/libusbx-1.0.14/msvc/listdevs.vcxproj.filters
  29. +0 −19 ext/libusbx-1.0.14/msvc/listdevs_sources
  30. +0 −256 ext/libusbx-1.0.14/msvc/stdint.h
  31. +0 −102 ext/libusbx-1.0.14/msvc/xusb.dsp
  32. +0 −344 ext/libusbx-1.0.14/msvc/xusb.vcproj
  33. +0 −163 ext/libusbx-1.0.14/msvc/xusb.vcxproj
  34. +0 −14 ext/libusbx-1.0.14/msvc/xusb.vcxproj.filters
  35. +0 −20 ext/libusbx-1.0.14/msvc/xusb_sources
View
@@ -2,7 +2,6 @@
.bundle
Gemfile.lock
pkg/*
-ext/libusbx-*
lib/libusb-1.0*
lib/pkgconfig
include
View
@@ -151,8 +151,11 @@ end
desc "Download and update bundled libusb(x)"
task :update_libusb => LIBUSB_TARBALL do
- sh 'git', 'rm', '-r', '-f', '-q', (EXT_BUILDDIR + "libusbx-*").to_s
+ sh 'rm', '-r', (EXT_BUILDDIR + "libusbx-*").to_s do end
+ sh 'git', 'rm', '-rfq', (EXT_BUILDDIR + "libusbx-*").to_s do end
sh 'tar', '-xjf', LIBUSB_TARBALL.to_s, '-C', EXT_LIBUSB_BUILDDIR.parent.to_s
+ drops = %w[msvc].map{|f| (EXT_LIBUSB_BUILDDIR+f).to_s }
+ sh 'rm', '-r', '-f', *drops
sh 'git', 'add', EXT_LIBUSB_BUILDDIR.to_s
end
@@ -1,30 +0,0 @@
-/* config.h. Manual config for MSVC. */
-
-#ifndef _MSC_VER
-#warn "msvc/config.h shouldn't be included for your development environment."
-#error "Please make sure the msvc/ directory is removed from your build path."
-#endif
-
-/* Disable: warning C4200: nonstandard extension used : zero-sized array in struct/union */
-#pragma warning(disable:4200)
-#if defined(_PREFAST_)
-/* Disable "Banned API" errors when using the MS's WDK OACR/Prefast */
-#pragma warning(disable:28719)
-/* Disable "The function 'InitializeCriticalSection' must be called from within a try/except block" */
-#pragma warning(disable:28125)
-#endif
-
-/* Default visibility */
-#define DEFAULT_VISIBILITY /**/
-
-/* Start with debug message logging enabled */
-//#define ENABLE_DEBUG_LOGGING 1
-
-/* Message logging */
-#define ENABLE_LOGGING 1
-
-/* Windows backend */
-#define OS_WINDOWS 1
-
-/* type of second poll() argument */
-#define POLL_NFDS_TYPE unsigned int
@@ -1,155 +0,0 @@
-@echo off
-::# default builds static library.
-::# you can pass the following arguments (case insensitive):
-::# - "DLL" to build a DLL instead of a static library
-::# - "/MT" to build a static library compatible with MSVC's /MT option (LIBCMT vs MSVCRT)
-
-if Test%BUILD_ALT_DIR%==Test goto usage
-
-::# process commandline parameters
-set TARGET=LIBRARY
-set STATIC_LIBC=
-set version=1.0
-set PWD=%~dp0
-set BUILD_CMD=build -bcwgZ -M2
-
-if "%1" == "" goto no_more_args
-::# /I for case insensitive
-if /I Test%1==TestDLL set TARGET=DYNLINK
-if /I Test%1==Test/MT set STATIC_LIBC=1
-:no_more_args
-
-cd ..\libusb\os
-echo TARGETTYPE=%TARGET% > target
-copy target+..\..\msvc\libusb_sources sources >NUL 2>&1
-del target
-@echo on
-%BUILD_CMD%
-@echo off
-if errorlevel 1 goto builderror
-cd ..\..
-
-set cpudir=i386
-set destType=Win32
-if %_BUILDARCH%==x86 goto isI386
-set cpudir=amd64
-set destType=x64
-:isI386
-
-set srcPath=libusb\os\obj%BUILD_ALT_DIR%\%cpudir%
-
-set dstPath=%destType%\Debug
-if %DDKBUILDENV%==chk goto isDebug
-set dstPath=%destType%\Release
-:isDebug
-
-if exist %destType% goto md2
-mkdir %destType%
-:md2
-if exist %dstPath% goto md3
-mkdir %dstPath%
-:md3
-if exist %dstPath%\dll goto md4
-mkdir %dstPath%\dll
-:md4
-if exist %dstPath%\lib goto md5
-md %dstPath%\lib
-:md5
-if exist %dstPath%\examples goto md6
-md %dstPath%\examples
-:md6
-@echo on
-
-@if /I NOT Test%1==TestDLL goto copylib
-copy %srcPath%\libusb-%version%.dll %dstPath%\dll
-copy %srcPath%\libusb-%version%.pdb %dstPath%\dll
-:copylib
-copy %srcPath%\libusb-%version%.lib %dstPath%\lib
-
-@echo off
-
-if exist examples\listdevs_ddkbuild goto md7
-md examples\listdevs_ddkbuild
-:md7
-
-cd examples\listdevs_ddkbuild
-copy ..\..\msvc\listdevs_sources sources >NUL 2>&1
-@echo on
-%BUILD_CMD%
-@echo off
-if errorlevel 1 goto builderror
-cd ..\..
-
-set srcPath=examples\listdevs_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
-@echo on
-
-copy %srcPath%\listdevs.exe %dstPath%\examples
-copy %srcPath%\listdevs.pdb %dstPath%\examples
-
-@echo off
-
-if exist examples\xusb_ddkbuild goto md8
-md examples\xusb_ddkbuild
-:md8
-
-cd examples\xusb_ddkbuild
-copy ..\..\msvc\xusb_sources sources >NUL 2>&1
-@echo on
-%BUILD_CMD%
-@echo off
-if errorlevel 1 goto builderror
-cd ..\..
-
-set srcPath=examples\xusb_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
-@echo on
-
-copy %srcPath%\xusb.exe %dstPath%\examples
-copy %srcPath%\xusb.pdb %dstPath%\examples
-
-@echo off
-
-if exist examples\getopt\getopt_ddkbuild goto md9
-md examples\getopt\getopt_ddkbuild
-:md9
-
-cd examples\getopt\getopt_ddkbuild
-copy ..\..\..\msvc\getopt_sources sources >NUL 2>&1
-@echo on
-%BUILD_CMD%
-@echo off
-if errorlevel 1 goto builderror
-cd ..\..\..
-
-if exist examples\fxload_ddkbuild goto md8
-md examples\fxload_ddkbuild
-:md8
-
-cd examples\fxload_ddkbuild
-copy ..\..\msvc\fxload_sources sources >NUL 2>&1
-@echo on
-%BUILD_CMD%
-@echo off
-if errorlevel 1 goto builderror
-cd ..\..
-
-set srcPath=examples\fxload_ddkbuild\obj%BUILD_ALT_DIR%\%cpudir%
-@echo on
-
-copy %srcPath%\fxload.exe %dstPath%\examples
-copy %srcPath%\fxload.pdb %dstPath%\examples
-
-@echo off
-
-cd msvc
-goto done
-
-:usage
-echo ddk_build must be run in a WDK build environment
-pause
-goto done
-
-:builderror
-echo Build failed
-
-:done
-cd %PWD%
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>fxload</ProjectName>
- <ProjectGuid>{9E166F7A-A793-9FB6-0A67-F0AED8AE8C88}</ProjectGuid>
- <RootNamespace>examples</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\$(Platform)\$(Configuration)\examples\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <BuildLog>
- <Path>$(IntDir)$(ProjectName).htm</Path>
- </BuildLog>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <BuildLog>
- <Path>$(IntDir)$(ProjectName).htm</Path>
- </BuildLog>
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <BuildLog>
- <Path>$(IntDir)$(ProjectName).htm</Path>
- </BuildLog>
- <ClCompile>
- <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- </ClCompile>
- <Link>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <BuildLog>
- <Path>$(IntDir)$(ProjectName).htm</Path>
- </BuildLog>
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalIncludeDirectories>.;..\examples\getopt;..\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;__GNU_LIBRARY__;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- </ClCompile>
- <Link>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\examples\ezusb.c" />
- <ClCompile Include="..\examples\fxload.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include=".\libusb_static.vcxproj">
- <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="getopt.vcxproj">
- <Project>{ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e}</Project>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\examples\ezusb.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Oops, something went wrong.

0 comments on commit 8f7fbe0

Please sign in to comment.