mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
patchupdate.py: Remove support for patch categories.
This commit is contained in:
Sebastian Lackner
parent
bf7d655c80
commit
819d0a394b
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [26256] Support for setcap on wine-preloader
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [18477] Avoid crashing when broken app tries to release surface although refcount is zero
|
||||
Category: stable
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
Fixes: Add stub for D3DXComputeNormalMap
|
||||
Fixes: [38334] Add stub for D3DXFrameFind
|
||||
Fixes: [41697] Add stub for D3DXComputeTangent
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [34101] Implement ID3DXEffect::FindNextValidTechnique
|
||||
Category: stable
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [32572] Support for ID3DXSkinInfoImpl_UpdateSkinnedMesh
|
||||
Category: stable
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [17233] Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces
|
||||
Category: stable
|
||||
|
||||
@ -2,4 +2,3 @@ Fixes: [32323] Implement an Arial replacement font
|
||||
Fixes: [32342] Implement a Times New Roman replacement font
|
||||
Fixes: [20456] Implement a Courier New replacement font
|
||||
Fixes: [13829] Implement a Microsoft Yahei replacement font
|
||||
Category: stable
|
||||
|
||||
@ -3,4 +3,3 @@ Fixes: Improve ReadDataAvailable handling in FilePipeLocalInformation class
|
||||
Fixes: Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryInformationFile
|
||||
FIxes: Return proper status codes when NtReadFile/NtWriteFile is called on closed (but not disconnected) pipe
|
||||
Depends: server-Desktop_Refcount
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: Add support for process specific debug channels
|
||||
Category: stable
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
Fixes: [10767] Fix comparison of punctuation characters in lstrcmp
|
||||
Fixes: [32490] Graphical issues in Inquisitor
|
||||
Category: stable
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -2,4 +2,3 @@ Fixes: [37811] Add implementation for mfplat.MFTRegister
|
||||
Fixes: [39309] Add implementation for mfplat.MFTEnum
|
||||
Fixes: [39367] Return stub interface from mf.MFCreateMediaSession
|
||||
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [38235] Fix device paths in HKLM\SYSTEM\MountedDevices
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [38662] Implement mscoree._CorValidateImage for mono runtime
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: Process APC calls before starting process
|
||||
Category: stable
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
Fixes: [38661] Implement proper handling of CLI .NET images in Wine library loader
|
||||
Depends: mscoree-CorValidateImage
|
||||
Category: stable
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
Fixes: [9158] Support for DOS hidden/system file attributes
|
||||
# Depends: ntdll-Syscall_Wrappers
|
||||
Category: stable
|
||||
|
||||
@ -2,4 +2,3 @@ Fixes: Support for loader dll redirections
|
||||
Depends: ntdll-Loader_Machine_Type
|
||||
Depends: ntdll-DllOverrides_WOW64
|
||||
Depends: ntdll-Attach_Process_DLLs
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: Support for FileFsFullSizeInformation information class
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [33162] Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: Improvement for heap allocation performance
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [28995] Allow special characters in pipe names
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Category: stable
|
||||
Depends: ntdll-RtlQueryPackageIdentity
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: Fix race-condition when threads are killed during shutdown
|
||||
Category: stable
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -1,4 +1,3 @@
|
||||
Fixes: Avoid race-conditions in NtReadFile() operations with write watches.
|
||||
Depends: ws2_32-WriteWatches
|
||||
Depends: kernel32-Named_Pipe
|
||||
Category: stable
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -456,13 +456,7 @@ patch_enable_all ()
|
||||
enable_xinput9_1_0_Parentsrc="$1"
|
||||
}
|
||||
|
||||
# Enable or disable all categories
|
||||
category_enable_all ()
|
||||
{
|
||||
enable_category_stable="$1"
|
||||
}
|
||||
|
||||
# Enable or disable a specific patchset/category
|
||||
# Enable or disable a specific patchset
|
||||
patch_enable ()
|
||||
{
|
||||
case "$1" in
|
||||
@ -517,9 +511,6 @@ patch_enable ()
|
||||
cabinet-iFolder)
|
||||
enable_cabinet_iFolder="$2"
|
||||
;;
|
||||
category-stable)
|
||||
enable_category_stable="$2"
|
||||
;;
|
||||
combase-RoApi)
|
||||
enable_combase_RoApi="$2"
|
||||
;;
|
||||
@ -1594,7 +1585,6 @@ patch_enable ()
|
||||
|
||||
# Default settings
|
||||
patch_enable_all 0
|
||||
category_enable_all 0
|
||||
enable_patchlist=1
|
||||
enable_autoconf=1
|
||||
patchlist="/dev/null"
|
||||
@ -1941,209 +1931,6 @@ patch_apply()
|
||||
}
|
||||
|
||||
|
||||
if test "$enable_category_stable" -eq 1; then
|
||||
if test "$enable_Compiler_Warnings" -gt 1; then
|
||||
abort "Patchset Compiler_Warnings disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_Staging" -gt 1; then
|
||||
abort "Patchset Staging disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_configure_Absolute_RPATH" -gt 1; then
|
||||
abort "Patchset configure-Absolute_RPATH disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_d3d9_Surface_Refcount" -gt 1; then
|
||||
abort "Patchset d3d9-Surface_Refcount disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_d3dx9_36_D3DXStubs" -gt 1; then
|
||||
abort "Patchset d3dx9_36-D3DXStubs disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_d3dx9_36_FindNextValidTechnique" -gt 1; then
|
||||
abort "Patchset d3dx9_36-FindNextValidTechnique disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_d3dx9_36_Optimize_Inplace" -gt 1; then
|
||||
abort "Patchset d3dx9_36-Optimize_Inplace disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_d3dx9_36_Texture_Align" -gt 1; then
|
||||
abort "Patchset d3dx9_36-Texture_Align disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_d3dx9_36_UpdateSkinnedMesh" -gt 1; then
|
||||
abort "Patchset d3dx9_36-UpdateSkinnedMesh disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_dbghelp_Debug_Symbols" -gt 1; then
|
||||
abort "Patchset dbghelp-Debug_Symbols disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ddraw_EnumSurfaces" -gt 1; then
|
||||
abort "Patchset ddraw-EnumSurfaces disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_fonts_Missing_Fonts" -gt 1; then
|
||||
abort "Patchset fonts-Missing_Fonts disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_kernel32_Named_Pipe" -gt 1; then
|
||||
abort "Patchset kernel32-Named_Pipe disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_libs_Debug_Channel" -gt 1; then
|
||||
abort "Patchset libs-Debug_Channel disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_libs_Unicode_Collation" -gt 1; then
|
||||
abort "Patchset libs-Unicode_Collation disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_makedep_PARENTSPEC" -gt 1; then
|
||||
abort "Patchset makedep-PARENTSPEC disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_mfplat_MFTRegister" -gt 1; then
|
||||
abort "Patchset mfplat-MFTRegister disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_mountmgr_DosDevices" -gt 1; then
|
||||
abort "Patchset mountmgr-DosDevices disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_mscoree_CorValidateImage" -gt 1; then
|
||||
abort "Patchset mscoree-CorValidateImage disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_APC_Start_Process" -gt 1; then
|
||||
abort "Patchset ntdll-APC_Start_Process disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_CLI_Images" -gt 1; then
|
||||
abort "Patchset ntdll-CLI_Images disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_DOS_Attributes" -gt 1; then
|
||||
abort "Patchset ntdll-DOS_Attributes disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_DllRedirects" -gt 1; then
|
||||
abort "Patchset ntdll-DllRedirects disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_FileFsFullSizeInformation" -gt 1; then
|
||||
abort "Patchset ntdll-FileFsFullSizeInformation disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_Fix_Alignment" -gt 1; then
|
||||
abort "Patchset ntdll-Fix_Alignment disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_Heap_FreeLists" -gt 1; then
|
||||
abort "Patchset ntdll-Heap_FreeLists disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_Pipe_SpecialCharacters" -gt 1; then
|
||||
abort "Patchset ntdll-Pipe_SpecialCharacters disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_RtlIpStringToAddress_Tests" -gt 1; then
|
||||
abort "Patchset ntdll-RtlIpStringToAddress_Tests disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_Threading" -gt 1; then
|
||||
abort "Patchset ntdll-Threading disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_User_Shared_Data" -gt 1; then
|
||||
abort "Patchset ntdll-User_Shared_Data disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ntdll_WriteWatches" -gt 1; then
|
||||
abort "Patchset ntdll-WriteWatches disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_opengl32_Revert_Disable_Ext" -gt 1; then
|
||||
abort "Patchset opengl32-Revert_Disable_Ext disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_server_ClipCursor" -gt 1; then
|
||||
abort "Patchset server-ClipCursor disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_server_CreateProcess_ACLs" -gt 1; then
|
||||
abort "Patchset server-CreateProcess_ACLs disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_shell32_RunDLL_CallEntry16" -gt 1; then
|
||||
abort "Patchset shell32-RunDLL_CallEntry16 disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_shell32_SHFileOperation_Win9x" -gt 1; then
|
||||
abort "Patchset shell32-SHFileOperation_Win9x disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_user32_DrawTextExW" -gt 1; then
|
||||
abort "Patchset user32-DrawTextExW disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_wine_inf_Performance" -gt 1; then
|
||||
abort "Patchset wine.inf-Performance disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_wineboot_HKEY_DYN_DATA" -gt 1; then
|
||||
abort "Patchset wineboot-HKEY_DYN_DATA disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_winecfg_Libraries" -gt 1; then
|
||||
abort "Patchset winecfg-Libraries disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_wined3d_Silence_FIXMEs" -gt 1; then
|
||||
abort "Patchset wined3d-Silence_FIXMEs disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_winemenubuilder_Desktop_Icon_Path" -gt 1; then
|
||||
abort "Patchset winemenubuilder-Desktop_Icon_Path disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_winepulse_PulseAudio_Support" -gt 1; then
|
||||
abort "Patchset winepulse-PulseAudio_Support disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_winex11_Window_Style" -gt 1; then
|
||||
abort "Patchset winex11-Window_Style disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_winex11_XEMBED" -gt 1; then
|
||||
abort "Patchset winex11-XEMBED disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_winex11_wglShareLists" -gt 1; then
|
||||
abort "Patchset winex11-wglShareLists disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_wininet_ParseX509EncodedCertificateForListBoxEntry" -gt 1; then
|
||||
abort "Patchset wininet-ParseX509EncodedCertificateForListBoxEntry disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_winmm_Delay_Import_Depends" -gt 1; then
|
||||
abort "Patchset winmm-Delay_Import_Depends disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ws2_32_Connect_Time" -gt 1; then
|
||||
abort "Patchset ws2_32-Connect_Time disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_ws2_32_WriteWatches" -gt 1; then
|
||||
abort "Patchset ws2_32-WriteWatches disabled, but category-stable depends on that."
|
||||
fi
|
||||
enable_Compiler_Warnings=1
|
||||
enable_Staging=1
|
||||
enable_configure_Absolute_RPATH=1
|
||||
enable_d3d9_Surface_Refcount=1
|
||||
enable_d3dx9_36_D3DXStubs=1
|
||||
enable_d3dx9_36_FindNextValidTechnique=1
|
||||
enable_d3dx9_36_Optimize_Inplace=1
|
||||
enable_d3dx9_36_Texture_Align=1
|
||||
enable_d3dx9_36_UpdateSkinnedMesh=1
|
||||
enable_dbghelp_Debug_Symbols=1
|
||||
enable_ddraw_EnumSurfaces=1
|
||||
enable_fonts_Missing_Fonts=1
|
||||
enable_kernel32_Named_Pipe=1
|
||||
enable_libs_Debug_Channel=1
|
||||
enable_libs_Unicode_Collation=1
|
||||
enable_makedep_PARENTSPEC=1
|
||||
enable_mfplat_MFTRegister=1
|
||||
enable_mountmgr_DosDevices=1
|
||||
enable_mscoree_CorValidateImage=1
|
||||
enable_ntdll_APC_Start_Process=1
|
||||
enable_ntdll_CLI_Images=1
|
||||
enable_ntdll_DOS_Attributes=1
|
||||
enable_ntdll_DllRedirects=1
|
||||
enable_ntdll_FileFsFullSizeInformation=1
|
||||
enable_ntdll_Fix_Alignment=1
|
||||
enable_ntdll_Heap_FreeLists=1
|
||||
enable_ntdll_Pipe_SpecialCharacters=1
|
||||
enable_ntdll_RtlIpStringToAddress_Tests=1
|
||||
enable_ntdll_Threading=1
|
||||
enable_ntdll_User_Shared_Data=1
|
||||
enable_ntdll_WriteWatches=1
|
||||
enable_opengl32_Revert_Disable_Ext=1
|
||||
enable_server_ClipCursor=1
|
||||
enable_server_CreateProcess_ACLs=1
|
||||
enable_shell32_RunDLL_CallEntry16=1
|
||||
enable_shell32_SHFileOperation_Win9x=1
|
||||
enable_user32_DrawTextExW=1
|
||||
enable_wine_inf_Performance=1
|
||||
enable_wineboot_HKEY_DYN_DATA=1
|
||||
enable_winecfg_Libraries=1
|
||||
enable_wined3d_Silence_FIXMEs=1
|
||||
enable_winemenubuilder_Desktop_Icon_Path=1
|
||||
enable_winepulse_PulseAudio_Support=1
|
||||
enable_winex11_Window_Style=1
|
||||
enable_winex11_XEMBED=1
|
||||
enable_winex11_wglShareLists=1
|
||||
enable_wininet_ParseX509EncodedCertificateForListBoxEntry=1
|
||||
enable_winmm_Delay_Import_Depends=1
|
||||
enable_ws2_32_Connect_Time=1
|
||||
enable_ws2_32_WriteWatches=1
|
||||
fi
|
||||
|
||||
if test "$enable_ws2_32_WSACleanup" -eq 1; then
|
||||
if test "$enable_server_Desktop_Refcount" -gt 1; then
|
||||
abort "Patchset server-Desktop_Refcount disabled, but ws2_32-WSACleanup depends on that."
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [38087] Fix multithreading issues with fullscreen clipping
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [22006] Support for process ACLs
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [23033] Use manual relay for RunDLL_CallEntry16 in shell32
|
||||
Category: stable
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
Fixes: [37916] Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW
|
||||
Depends: shell32-Progress_Dialog
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [22109] Fix handling of invert_y in DrawTextExW
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [33661] Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [17823] Assign a drive serial number during prefix creation/update
|
||||
#Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [7115] Need for Speed 3 installer requires devices in HKEY_DYN_DATA
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: Allow to edit winecfg library override by double clicking
|
||||
Category: stable
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
#Fixes: [35950] Fix black screen on startup introduced by pixelformat changes.
|
||||
#Fixes: [35975] Fix gray screen on startup introduced by pixelformat changes.
|
||||
#Fixes: [36900] Fix missing video introduced by pixelformat changes.
|
||||
Category: stable
|
||||
Disabled: true
|
||||
|
||||
# Causes regression?
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
Fixes: Silence repeated FIXME message in surface_cpu_blt
|
||||
Fixes: [42140] Silence noisy FIXME in gl_stencil_op
|
||||
Category: stable
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Category: stable
|
||||
@ -4,4 +4,3 @@ Fixes: Fix possible segfault in pulse_rd_loop of PulseAudio backend
|
||||
Fixes: Add support for GetPropValue to PulseAudio backend
|
||||
Fixes: Use actual program name if available to describe PulseAudio streams
|
||||
Fixes: Expose PKEY_AudioEndpoint_PhysicalSpeakers device property in PulseAudio driver
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [37876] Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: XEMBED support for embedding Wine windows inside Linux applications
|
||||
Category: stable
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
Fixes: [11436] Do not fail when a used context is passed to wglShareLists
|
||||
Fixes: [25419] Fix broken textures in XIII Century: Death or Glory
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [29842] Add stub for wininet.ParseX509EncodedCertificateForListBoxEntry
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [37983] Jedi Knight: Dark Forces II crashes with winmm set to native
|
||||
Category: stable
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: SO_CONNECT_TIME returns the appropriate time
|
||||
Category: stable
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
Fixes: Avoid race-conditions of async WSARecv() operations with write watches.
|
||||
Fixes: Avoid race-conditions with write watches in WS2_async_accept.
|
||||
Fixes: Basic handling of write watches triggered while we're on the signal stack.
|
||||
Category: stable
|
||||
|
||||
@ -83,7 +83,6 @@ warning()
|
||||
|
||||
# Default settings
|
||||
patch_enable_all 0
|
||||
category_enable_all 0
|
||||
enable_patchlist=1
|
||||
enable_autoconf=1
|
||||
patchlist="/dev/null"
|
||||
|
||||
@ -77,14 +77,12 @@ class PatchUpdaterError(RuntimeError):
|
||||
class PatchSet(object):
|
||||
def __init__(self, name, directory):
|
||||
self.name = name
|
||||
self.is_category = False
|
||||
self.variable = None
|
||||
self.directory = directory
|
||||
self.fixes = []
|
||||
self.changes = []
|
||||
self.disabled = False
|
||||
self.ifdefined = None
|
||||
self.categories = []
|
||||
|
||||
self.files = []
|
||||
self.patches = []
|
||||
@ -176,7 +174,6 @@ def load_patchsets():
|
||||
unique_id = itertools.count()
|
||||
all_patches = {}
|
||||
name_to_id = {}
|
||||
categories = {}
|
||||
|
||||
for name, directory in enum_patchsets(config.path_patches):
|
||||
patch = PatchSet(name, directory)
|
||||
@ -235,12 +232,6 @@ def load_patchsets():
|
||||
if i != j and any([fnmatch.fnmatch(f, val) for f in other_patch.modified_files]):
|
||||
other_patch.auto_depends.add(i)
|
||||
|
||||
elif key == "category":
|
||||
val = "category-%s" % val
|
||||
if name_to_id.has_key(val):
|
||||
raise PatchUpdaterError("Category name in definition file %s collides with patchset %s" % (filename, val))
|
||||
patch.categories.append(val)
|
||||
|
||||
elif key == "fixes":
|
||||
r = re.match("^\\[ *(!)? *([0-9]+) *\\](.*)$", val)
|
||||
if r:
|
||||
@ -259,29 +250,10 @@ def load_patchsets():
|
||||
else:
|
||||
print "WARNING: Ignoring unknown command in definition file %s: %s" % (filename, line)
|
||||
|
||||
# If patch is not disabled then finally add it to the category
|
||||
if patch.disabled:
|
||||
continue
|
||||
|
||||
for category in patch.categories:
|
||||
if not categories.has_key(category):
|
||||
categories[category] = set()
|
||||
categories[category].add(i)
|
||||
|
||||
# Filter autodepends on disabled patchsets
|
||||
for i, patch in all_patches.iteritems():
|
||||
patch.auto_depends = set([j for j in patch.auto_depends if not all_patches[j].disabled])
|
||||
|
||||
# Add virtual targets for all the categories
|
||||
for category, indices in categories.iteritems():
|
||||
patch = PatchSet(category, directory)
|
||||
patch.is_category = True
|
||||
patch.depends = indices
|
||||
|
||||
i = next(unique_id)
|
||||
all_patches[i] = patch
|
||||
name_to_id[name] = i
|
||||
|
||||
return all_patches
|
||||
|
||||
def causal_time_combine(a, b):
|
||||
@ -665,23 +637,12 @@ def generate_script(all_patches, resolved):
|
||||
lines.append("patch_enable_all ()\n")
|
||||
lines.append("{\n")
|
||||
for i, patch in sorted([(i, all_patches[i]) for i in resolved], key=lambda x:x[1].name):
|
||||
if patch.is_category: continue
|
||||
patch.variable = "enable_%s" % patch.name.replace("-","_").replace(".","_")
|
||||
lines.append("\t%s=\"$1\"\n" % patch.variable)
|
||||
lines.append("}\n")
|
||||
lines.append("\n")
|
||||
|
||||
lines.append("# Enable or disable all categories\n")
|
||||
lines.append("category_enable_all ()\n")
|
||||
lines.append("{\n")
|
||||
for i, patch in sorted([(i, all_patches[i]) for i in resolved], key=lambda x:x[1].name):
|
||||
if not patch.is_category: continue
|
||||
patch.variable = "enable_%s" % patch.name.replace("-","_").replace(".","_")
|
||||
lines.append("\t%s=\"$1\"\n" % patch.variable)
|
||||
lines.append("}\n")
|
||||
lines.append("\n")
|
||||
|
||||
lines.append("# Enable or disable a specific patchset/category\n")
|
||||
lines.append("# Enable or disable a specific patchset\n")
|
||||
lines.append("patch_enable ()\n")
|
||||
lines.append("{\n")
|
||||
lines.append("\tcase \"$1\" in\n")
|
||||
@ -715,11 +676,6 @@ def generate_script(all_patches, resolved):
|
||||
# Generate code for applying all patchsets
|
||||
lines = []
|
||||
for i, patch in [(i, all_patches[i]) for i in resolved]:
|
||||
|
||||
# Categories do not have any files associated, so just skip over
|
||||
if len(patch.files) == 0:
|
||||
continue
|
||||
|
||||
lines.append("# Patchset %s\n" % patch.name)
|
||||
lines.append("# |\n")
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user