From 78e45c2db619e148716b77c5c05b4b699c2a7d59 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sat, 4 Jan 2025 21:38:04 +0400 Subject: [PATCH] Style: Replace TABs with spaces for indentation in some files Mark files that must use TABs to indent in the `.gitattributes`. Use space instead of TABs in sources and some data/test files. --- .gitattributes | 21 ++ Auxiliary/vim/.gitattributes | 1 + Modules/Internal/CPack/.gitattributes | 2 + Templates/.gitattributes | 1 + .../.gitattributes | 2 +- Tests/CMakeTests/.gitattributes | 1 + Tests/CTestTestLabelRegExp/test.cmake.in | 4 +- Tests/CTestTestSerialInDepends/test.ctest | 8 +- Tests/MFC/mfc1/ReadMe.txt | 12 +- Tests/MFC/mfc1/mfc1.rc | 352 +++++++++--------- Tests/MSManifest/Subdir2/test_manifest1.in | 2 +- Tests/MSManifest/Subdir2/test_manifest2.in | 18 +- Tests/MumpsCoverage/.gitattributes | 1 + .../RunCMake/ParseImplicitData/.gitattributes | 1 + Tests/RunCMake/RunCPack/AppWiX/patch.xml | 10 +- Tests/RunCMake/VS10Project/my.props | 4 +- Tests/iOSNavApp/Classes/NavApp3AppDelegate.m | 6 +- Tests/iOSNavApp/Classes/RootViewController.m | 20 +- .../Release/WiX/CustomAction/.gitattributes | 1 + bootstrap | 9 +- 20 files changed, 253 insertions(+), 223 deletions(-) create mode 100644 Auxiliary/vim/.gitattributes create mode 100644 Modules/Internal/CPack/.gitattributes create mode 100644 Templates/.gitattributes create mode 100644 Tests/RunCMake/ParseImplicitData/.gitattributes create mode 100644 Utilities/Release/WiX/CustomAction/.gitattributes diff --git a/.gitattributes b/.gitattributes index 96a11664ef..5e2a5460c6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,6 +10,9 @@ # Do not perform whitespace checks. Do not format. [attr]generated whitespace=-tab-in-indent,-indent-with-non-tab -format.clang-format +# Custom attribute to mark files as TABs indented. +[attr]tab-indent whitespace=-tab-in-indent + bootstrap eol=lf configure eol=lf *.[1-9] eol=lf @@ -22,6 +25,24 @@ configure eol=lf *.sln eol=crlf *.vcproj eol=crlf +Makefile tab-indent +Makefile.in tab-indent +NSIS.template.in tab-indent +coverage.xml.in tab-indent +*.F tab-indent +*.f tab-indent +*.pbxproj.in tab-indent +*.plist.in tab-indent +*.plist tab-indent +*.sln tab-indent +*.s tab-indent +*.vcproj tab-indent +*.vcproj.in tab-indent +*.vfproj.in tab-indent +*.xib tab-indent +*.make tab-indent +.hooks-config tab-indent + *.pfx -text *.png -text *.png.in -text diff --git a/Auxiliary/vim/.gitattributes b/Auxiliary/vim/.gitattributes new file mode 100644 index 0000000000..c40dd66bd4 --- /dev/null +++ b/Auxiliary/vim/.gitattributes @@ -0,0 +1 @@ +extract-upper-case.pl tab-indent diff --git a/Modules/Internal/CPack/.gitattributes b/Modules/Internal/CPack/.gitattributes new file mode 100644 index 0000000000..ecc9de508f --- /dev/null +++ b/Modules/Internal/CPack/.gitattributes @@ -0,0 +1,2 @@ +# TODO Check if `CPack.distribution.dist.in` could use spaces +CPack.distribution.dist.in tab-indent diff --git a/Templates/.gitattributes b/Templates/.gitattributes new file mode 100644 index 0000000000..11b462190f --- /dev/null +++ b/Templates/.gitattributes @@ -0,0 +1 @@ +CPack.GenericLicense.txt conflict-marker-size=79 diff --git a/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes b/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes index 08b4ac4c81..f8e68b520b 100644 --- a/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes +++ b/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes @@ -1 +1 @@ -*.sln-file eol=crlf +*.sln-file eol=crlf tab-indent diff --git a/Tests/CMakeTests/.gitattributes b/Tests/CMakeTests/.gitattributes index c6148fbf22..d32296dba4 100644 --- a/Tests/CMakeTests/.gitattributes +++ b/Tests/CMakeTests/.gitattributes @@ -1 +1,2 @@ File-HASH-Input.txt eol=lf +ImplicitLinkInfoTest.cmake.in tab-indent diff --git a/Tests/CTestTestLabelRegExp/test.cmake.in b/Tests/CTestTestLabelRegExp/test.cmake.in index dd40c3b503..f1ccd3ac13 100644 --- a/Tests/CTestTestLabelRegExp/test.cmake.in +++ b/Tests/CTestTestLabelRegExp/test.cmake.in @@ -5,8 +5,8 @@ function(get_test_list TEST_LIST) execute_process(COMMAND ${QUERY_COMMAND} RESULT_VARIABLE RESULT - OUTPUT_VARIABLE OUTPUT - ERROR_VARIABLE ERROR) + OUTPUT_VARIABLE OUTPUT + ERROR_VARIABLE ERROR) if(NOT ${RESULT} STREQUAL "0") message(FATAL_ERROR "command [${QUERY_COMMAND}] failed: RESULT[${RESULT}] OUTPUT[${OUTPUT}] ERROR[${ERROR}]") diff --git a/Tests/CTestTestSerialInDepends/test.ctest b/Tests/CTestTestSerialInDepends/test.ctest index 71c6da25d4..a3e79f6893 100644 --- a/Tests/CTestTestSerialInDepends/test.ctest +++ b/Tests/CTestTestSerialInDepends/test.ctest @@ -4,10 +4,10 @@ set(LOCK_FILE "${TEST_NAME}.lock") file(REMOVE "${LOCK_FILE}") if("${TEST_NAME}" STREQUAL "i_want_to_be_alone") - file(GLOB LOCK_FILES *.lock) - if(LOCK_FILES) - message(FATAL_ERROR "found lock files of other tests even though this test should be running by itself: ${LOCK_FILES}") - endif() + file(GLOB LOCK_FILES *.lock) + if(LOCK_FILES) + message(FATAL_ERROR "found lock files of other tests even though this test should be running by itself: ${LOCK_FILES}") + endif() endif() file(WRITE "${LOCK_FILE}") diff --git a/Tests/MFC/mfc1/ReadMe.txt b/Tests/MFC/mfc1/ReadMe.txt index d84608e712..bf8a845ab2 100644 --- a/Tests/MFC/mfc1/ReadMe.txt +++ b/Tests/MFC/mfc1/ReadMe.txt @@ -110,12 +110,12 @@ Resource.h Microsoft Visual C++ reads and updates this file. mfc1.manifest - Application manifest files are used by Windows XP to describe an applications - dependency on specific versions of Side-by-Side assemblies. The loader uses this - information to load the appropriate assembly from the assembly cache or private - from the application. The Application manifest maybe included for redistribution - as an external .manifest file that is installed in the same folder as the application - executable or it may be included in the executable in the form of a resource. + Application manifest files are used by Windows XP to describe an applications + dependency on specific versions of Side-by-Side assemblies. The loader uses this + information to load the appropriate assembly from the assembly cache or private + from the application. The Application manifest maybe included for redistribution + as an external .manifest file that is installed in the same folder as the application + executable or it may be included in the executable in the form of a resource. ///////////////////////////////////////////////////////////////////////////// Other notes: diff --git a/Tests/MFC/mfc1/mfc1.rc b/Tests/MFC/mfc1/mfc1.rc index 346c5fb77d..4e5710c290 100644 --- a/Tests/MFC/mfc1/mfc1.rc +++ b/Tests/MFC/mfc1/mfc1.rc @@ -22,13 +22,13 @@ 1 TEXTINCLUDE BEGIN - "resource.h\0" + "resource.h\0" END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" - "\0" + "#include ""afxres.h""\r\n" + "\0" END 3 TEXTINCLUDE @@ -37,15 +37,15 @@ BEGIN "#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_TRACKER_RESOURCES\r\n" "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#include ""res\\mfc1.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#include ""afxprint.rc"" // printing/print preview resources\r\n" - "#endif\r\n" - "\0" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#include ""res\\mfc1.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#include ""afxprint.rc"" // printing/print preview resources\r\n" + "#endif\r\n" + "\0" END #endif // APSTUDIO_INVOKED @@ -82,11 +82,11 @@ BEGIN BUTTON ID_FILE_NEW BUTTON ID_FILE_OPEN BUTTON ID_FILE_SAVE - SEPARATOR + SEPARATOR BUTTON ID_EDIT_CUT BUTTON ID_EDIT_COPY BUTTON ID_EDIT_PASTE - SEPARATOR + SEPARATOR BUTTON ID_FILE_PRINT BUTTON ID_APP_ABOUT END @@ -103,70 +103,70 @@ LANGUAGE 9, 1 IDR_MAINFRAME MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW - MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP - MENUITEM SEPARATOR - MENUITEM "Recent File", ID_FILE_MRU_FILE1,GRAYED - MENUITEM SEPARATOR - MENUITEM "&Close", ID_FILE_CLOSE - MENUITEM "E&xit", ID_APP_EXIT - END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOLBAR - MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR - END - POPUP "&Help" - BEGIN - MENUITEM "&About mfc1...", ID_APP_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP + MENUITEM SEPARATOR + MENUITEM "Recent File", ID_FILE_MRU_FILE1,GRAYED + MENUITEM SEPARATOR + MENUITEM "&Close", ID_FILE_CLOSE + MENUITEM "E&xit", ID_APP_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOLBAR + MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR + END + POPUP "&Help" + BEGIN + MENUITEM "&About mfc1...", ID_APP_ABOUT + END END IDR_mfc1TYPE MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW - MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Close", ID_FILE_CLOSE - MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE - MENUITEM "Save &As...", ID_FILE_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT - MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW - MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP - MENUITEM SEPARATOR - MENUITEM "Recent File", ID_FILE_MRU_FILE1,GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit", ID_APP_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo\tCtrl+Z", ID_EDIT_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE - END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOLBAR - MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR - END - POPUP "&Window" - BEGIN - MENUITEM "&New Window", ID_WINDOW_NEW - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "&Tile", ID_WINDOW_TILE_HORZ - MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE - END - POPUP "&Help" - BEGIN - MENUITEM "&About mfc1...", ID_APP_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Close", ID_FILE_CLOSE + MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE + MENUITEM "Save &As...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT + MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW + MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP + MENUITEM SEPARATOR + MENUITEM "Recent File", ID_FILE_MRU_FILE1,GRAYED + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_APP_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", ID_EDIT_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOLBAR + MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR + END + POPUP "&Window" + BEGIN + MENUITEM "&New Window", ID_WINDOW_NEW + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "&Tile", ID_WINDOW_TILE_HORZ + MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE + END + POPUP "&Help" + BEGIN + MENUITEM "&About mfc1...", ID_APP_ABOUT + END END @@ -177,20 +177,20 @@ END IDR_MAINFRAME ACCELERATORS BEGIN - "N", ID_FILE_NEW, VIRTKEY,CONTROL - "O", ID_FILE_OPEN, VIRTKEY,CONTROL - "S", ID_FILE_SAVE, VIRTKEY,CONTROL - "P", ID_FILE_PRINT, VIRTKEY,CONTROL - "Z", ID_EDIT_UNDO, VIRTKEY,CONTROL - "X", ID_EDIT_CUT, VIRTKEY,CONTROL - "C", ID_EDIT_COPY, VIRTKEY,CONTROL - "V", ID_EDIT_PASTE, VIRTKEY,CONTROL - VK_BACK, ID_EDIT_UNDO, VIRTKEY,ALT - VK_DELETE, ID_EDIT_CUT, VIRTKEY,SHIFT - VK_INSERT, ID_EDIT_COPY, VIRTKEY,CONTROL - VK_INSERT, ID_EDIT_PASTE, VIRTKEY,SHIFT - VK_F6, ID_NEXT_PANE, VIRTKEY - VK_F6, ID_PREV_PANE, VIRTKEY,SHIFT + "N", ID_FILE_NEW, VIRTKEY,CONTROL + "O", ID_FILE_OPEN, VIRTKEY,CONTROL + "S", ID_FILE_SAVE, VIRTKEY,CONTROL + "P", ID_FILE_PRINT, VIRTKEY,CONTROL + "Z", ID_EDIT_UNDO, VIRTKEY,CONTROL + "X", ID_EDIT_CUT, VIRTKEY,CONTROL + "C", ID_EDIT_COPY, VIRTKEY,CONTROL + "V", ID_EDIT_PASTE, VIRTKEY,CONTROL + VK_BACK, ID_EDIT_UNDO, VIRTKEY,ALT + VK_DELETE, ID_EDIT_CUT, VIRTKEY,SHIFT + VK_INSERT, ID_EDIT_COPY, VIRTKEY,CONTROL + VK_INSERT, ID_EDIT_PASTE, VIRTKEY,SHIFT + VK_F6, ID_NEXT_PANE, VIRTKEY + VK_F6, ID_PREV_PANE, VIRTKEY,SHIFT END ///////////////////////////////////////////////////////////////////////////// @@ -209,11 +209,11 @@ CAPTION "About mfc1" STYLE DS_MODALFRAME | DS_SHELLFONT_FLAG | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "mfc1 Version 1.0",IDC_STATIC,40,10,119,8, + ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 + LTEXT "mfc1 Version 1.0",IDC_STATIC,40,10,119,8, SS_NOPREFIX - LTEXT "Copyright (C) 2011",IDC_STATIC,40,25,119,8 - DEFPUSHBUTTON "OK",IDOK,178,7,50,16,WS_GROUP + LTEXT "Copyright (C) 2011",IDC_STATIC,40,25,119,8 + DEFPUSHBUTTON "OK",IDOK,178,7,50,16,WS_GROUP END @@ -235,23 +235,23 @@ VS_VERSION_INFO VERSIONINFO FILETYPE 0x1L FILESUBTYPE 0x0L BEGIN - BLOCK "StringFileInfo" - BEGIN + BLOCK "StringFileInfo" + BEGIN BLOCK "040904e4" - BEGIN + BEGIN VALUE "CompanyName", "TODO: " VALUE "FileDescription", "TODO: " - VALUE "FileVersion", "1.0.0.1" - VALUE "InternalName", "mfc1.exe" + VALUE "FileVersion", "1.0.0.1" + VALUE "InternalName", "mfc1.exe" VALUE "LegalCopyright", "TODO: (c) . All rights reserved." - VALUE "OriginalFilename","mfc1.exe" + VALUE "OriginalFilename","mfc1.exe" VALUE "ProductName", "TODO: " - VALUE "ProductVersion", "1.0.0.1" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 1252 + VALUE "ProductVersion", "1.0.0.1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 END END @@ -281,95 +281,95 @@ END STRINGTABLE BEGIN // Non-mac-targeting apps remove the two extra substrings - IDR_MAINFRAME "mfc1" + IDR_MAINFRAME "mfc1" // has a file suffix - shell file type too - IDR_mfc1TYPE "\nmfc1\nmfc1\nmfc1 Files (*.mf1)\n.mf1\nmfc1.Document\nmfc1.Document" + IDR_mfc1TYPE "\nmfc1\nmfc1\nmfc1 Files (*.mf1)\n.mf1\nmfc1.Document\nmfc1.Document" END STRINGTABLE BEGIN - AFX_IDS_APP_TITLE "mfc1" - AFX_IDS_IDLEMESSAGE "Ready" + AFX_IDS_APP_TITLE "mfc1" + AFX_IDS_IDLEMESSAGE "Ready" END STRINGTABLE BEGIN - ID_INDICATOR_EXT "EXT" - ID_INDICATOR_CAPS "CAP" - ID_INDICATOR_NUM "NUM" - ID_INDICATOR_SCRL "SCRL" - ID_INDICATOR_OVR "OVR" - ID_INDICATOR_REC "REC" + ID_INDICATOR_EXT "EXT" + ID_INDICATOR_CAPS "CAP" + ID_INDICATOR_NUM "NUM" + ID_INDICATOR_SCRL "SCRL" + ID_INDICATOR_OVR "OVR" + ID_INDICATOR_REC "REC" END STRINGTABLE BEGIN - ID_FILE_NEW "Create a new document\nNew" - ID_FILE_OPEN "Open an existing document\nOpen" - ID_FILE_CLOSE "Close the active document\nClose" - ID_FILE_SAVE "Save the active document\nSave" - ID_FILE_SAVE_AS "Save the active document with a new name\nSave As" - ID_FILE_PAGE_SETUP "Change the printing options\nPage Setup" - ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup" - ID_FILE_PRINT "Print the active document\nPrint" - ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" - ID_APP_ABOUT "Display program information, version number and copyright\nAbout" - ID_APP_EXIT "Quit the application; prompts to save documents\nExit" - ID_FILE_MRU_FILE1 "Open this document" - ID_FILE_MRU_FILE2 "Open this document" - ID_FILE_MRU_FILE3 "Open this document" - ID_FILE_MRU_FILE4 "Open this document" - ID_FILE_MRU_FILE5 "Open this document" - ID_FILE_MRU_FILE6 "Open this document" - ID_FILE_MRU_FILE7 "Open this document" - ID_FILE_MRU_FILE8 "Open this document" - ID_FILE_MRU_FILE9 "Open this document" - ID_FILE_MRU_FILE10 "Open this document" - ID_FILE_MRU_FILE11 "Open this document" - ID_FILE_MRU_FILE12 "Open this document" - ID_FILE_MRU_FILE13 "Open this document" - ID_FILE_MRU_FILE14 "Open this document" - ID_FILE_MRU_FILE15 "Open this document" - ID_FILE_MRU_FILE16 "Open this document" - ID_NEXT_PANE "Switch to the next window pane\nNext Pane" - ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane" - ID_WINDOW_NEW "Open another window for the active document\nNew Window" - ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons" - ID_WINDOW_CASCADE "Arrange windows so they overlap\nCascade Windows" - ID_WINDOW_TILE_HORZ "Arrange windows as non-overlapping tiles\nTile Windows" - ID_WINDOW_TILE_VERT "Arrange windows as non-overlapping tiles\nTile Windows" - ID_WINDOW_SPLIT "Split the active window into panes\nSplit" - ID_EDIT_CLEAR "Erase the selection\nErase" - ID_EDIT_CLEAR_ALL "Erase everything\nErase All" - ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy" - ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut" - ID_EDIT_FIND "Find the specified text\nFind" - ID_EDIT_PASTE "Insert Clipboard contents\nPaste" - ID_EDIT_REPEAT "Repeat the last action\nRepeat" - ID_EDIT_REPLACE "Replace specific text with different text\nReplace" - ID_EDIT_SELECT_ALL "Select the entire document\nSelect All" - ID_EDIT_UNDO "Undo the last action\nUndo" - ID_EDIT_REDO "Redo the previously undone action\nRedo" - ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar" - ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar" + ID_FILE_NEW "Create a new document\nNew" + ID_FILE_OPEN "Open an existing document\nOpen" + ID_FILE_CLOSE "Close the active document\nClose" + ID_FILE_SAVE "Save the active document\nSave" + ID_FILE_SAVE_AS "Save the active document with a new name\nSave As" + ID_FILE_PAGE_SETUP "Change the printing options\nPage Setup" + ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup" + ID_FILE_PRINT "Print the active document\nPrint" + ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" + ID_APP_ABOUT "Display program information, version number and copyright\nAbout" + ID_APP_EXIT "Quit the application; prompts to save documents\nExit" + ID_FILE_MRU_FILE1 "Open this document" + ID_FILE_MRU_FILE2 "Open this document" + ID_FILE_MRU_FILE3 "Open this document" + ID_FILE_MRU_FILE4 "Open this document" + ID_FILE_MRU_FILE5 "Open this document" + ID_FILE_MRU_FILE6 "Open this document" + ID_FILE_MRU_FILE7 "Open this document" + ID_FILE_MRU_FILE8 "Open this document" + ID_FILE_MRU_FILE9 "Open this document" + ID_FILE_MRU_FILE10 "Open this document" + ID_FILE_MRU_FILE11 "Open this document" + ID_FILE_MRU_FILE12 "Open this document" + ID_FILE_MRU_FILE13 "Open this document" + ID_FILE_MRU_FILE14 "Open this document" + ID_FILE_MRU_FILE15 "Open this document" + ID_FILE_MRU_FILE16 "Open this document" + ID_NEXT_PANE "Switch to the next window pane\nNext Pane" + ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane" + ID_WINDOW_NEW "Open another window for the active document\nNew Window" + ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons" + ID_WINDOW_CASCADE "Arrange windows so they overlap\nCascade Windows" + ID_WINDOW_TILE_HORZ "Arrange windows as non-overlapping tiles\nTile Windows" + ID_WINDOW_TILE_VERT "Arrange windows as non-overlapping tiles\nTile Windows" + ID_WINDOW_SPLIT "Split the active window into panes\nSplit" + ID_EDIT_CLEAR "Erase the selection\nErase" + ID_EDIT_CLEAR_ALL "Erase everything\nErase All" + ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy" + ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut" + ID_EDIT_FIND "Find the specified text\nFind" + ID_EDIT_PASTE "Insert Clipboard contents\nPaste" + ID_EDIT_REPEAT "Repeat the last action\nRepeat" + ID_EDIT_REPLACE "Replace specific text with different text\nReplace" + ID_EDIT_SELECT_ALL "Select the entire document\nSelect All" + ID_EDIT_UNDO "Undo the last action\nUndo" + ID_EDIT_REDO "Redo the previously undone action\nRedo" + ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar" + ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar" END STRINGTABLE BEGIN - AFX_IDS_SCSIZE "Change the window size" - AFX_IDS_SCMOVE "Change the window position" - AFX_IDS_SCMINIMIZE "Reduce the window to an icon" - AFX_IDS_SCMAXIMIZE "Enlarge the window to full size" - AFX_IDS_SCNEXTWINDOW "Switch to the next document window" - AFX_IDS_SCPREVWINDOW "Switch to the previous document window" - AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" - AFX_IDS_SCRESTORE "Restore the window to normal size" - AFX_IDS_SCTASKLIST "Activate Task List" - AFX_IDS_MDICHILD "Activate this window" - AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview" + AFX_IDS_SCSIZE "Change the window size" + AFX_IDS_SCMOVE "Change the window position" + AFX_IDS_SCMINIMIZE "Reduce the window to an icon" + AFX_IDS_SCMAXIMIZE "Enlarge the window to full size" + AFX_IDS_SCNEXTWINDOW "Switch to the next document window" + AFX_IDS_SCPREVWINDOW "Switch to the previous document window" + AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" + AFX_IDS_SCRESTORE "Restore the window to normal size" + AFX_IDS_SCTASKLIST "Activate Task List" + AFX_IDS_MDICHILD "Activate this window" + AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview" END #endif #ifdef _UNICODE -IDR_MANIFEST RT_MANIFEST "res\\mfc1.manifest" +IDR_MANIFEST RT_MANIFEST "res\\mfc1.manifest" #endif #ifndef APSTUDIO_INVOKED @@ -387,7 +387,7 @@ IDR_MANIFEST RT_MANIFEST "res\\mfc1.manifest" LANGUAGE 9, 1 #pragma code_page(1252) #include "res\\mfc1.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components +#include "afxres.rc" // Standard components #include "afxprint.rc" // printing/print preview resources #endif #endif // not APSTUDIO_INVOKED diff --git a/Tests/MSManifest/Subdir2/test_manifest1.in b/Tests/MSManifest/Subdir2/test_manifest1.in index f36eead163..b2fa573b92 100644 --- a/Tests/MSManifest/Subdir2/test_manifest1.in +++ b/Tests/MSManifest/Subdir2/test_manifest1.in @@ -1,5 +1,5 @@ - CMake Multiple Manifest Test Application + CMake Multiple Manifest Test Application diff --git a/Tests/MSManifest/Subdir2/test_manifest2.in b/Tests/MSManifest/Subdir2/test_manifest2.in index ec96f115a6..f91b94e2c4 100644 --- a/Tests/MSManifest/Subdir2/test_manifest2.in +++ b/Tests/MSManifest/Subdir2/test_manifest2.in @@ -1,12 +1,12 @@ - - - - - - - - - + + + + + + + + + diff --git a/Tests/MumpsCoverage/.gitattributes b/Tests/MumpsCoverage/.gitattributes index 9fc9b0ff2a..86e85dc64d 100644 --- a/Tests/MumpsCoverage/.gitattributes +++ b/Tests/MumpsCoverage/.gitattributes @@ -1 +1,2 @@ *.cmcov eol=crlf +*.m tab-indent diff --git a/Tests/RunCMake/ParseImplicitData/.gitattributes b/Tests/RunCMake/ParseImplicitData/.gitattributes new file mode 100644 index 0000000000..2f3ef8c247 --- /dev/null +++ b/Tests/RunCMake/ParseImplicitData/.gitattributes @@ -0,0 +1 @@ +*.input tab-indent diff --git a/Tests/RunCMake/RunCPack/AppWiX/patch.xml b/Tests/RunCMake/RunCPack/AppWiX/patch.xml index 13c392d3ce..e23c33c651 100644 --- a/Tests/RunCMake/RunCPack/AppWiX/patch.xml +++ b/Tests/RunCMake/RunCPack/AppWiX/patch.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/Tests/RunCMake/VS10Project/my.props b/Tests/RunCMake/VS10Project/my.props index 7c98cde3a0..43b9ff1cbe 100644 --- a/Tests/RunCMake/VS10Project/my.props +++ b/Tests/RunCMake/VS10Project/my.props @@ -1,5 +1,5 @@ - - + + diff --git a/Tests/iOSNavApp/Classes/NavApp3AppDelegate.m b/Tests/iOSNavApp/Classes/NavApp3AppDelegate.m index c82204c111..4cfd1ccba0 100644 --- a/Tests/iOSNavApp/Classes/NavApp3AppDelegate.m +++ b/Tests/iOSNavApp/Classes/NavApp3AppDelegate.m @@ -79,9 +79,9 @@ - (void)dealloc { - [navigationController release]; - [window release]; - [super dealloc]; + [navigationController release]; + [window release]; + [super dealloc]; } diff --git a/Tests/iOSNavApp/Classes/RootViewController.m b/Tests/iOSNavApp/Classes/RootViewController.m index 8a20d89db4..ffa6dc967f 100644 --- a/Tests/iOSNavApp/Classes/RootViewController.m +++ b/Tests/iOSNavApp/Classes/RootViewController.m @@ -38,20 +38,20 @@ */ /* - (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; + [super viewWillDisappear:animated]; } */ /* - (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; + [super viewDidDisappear:animated]; } */ /* // Override to allow orientations other than the default portrait orientation. - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations. - return (interfaceOrientation == UIInterfaceOrientationPortrait); + // Return YES for supported orientations. + return (interfaceOrientation == UIInterfaceOrientationPortrait); } */ @@ -82,7 +82,7 @@ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; } - // Configure the cell. + // Configure the cell. cell.textLabel.text = [NSString stringWithFormat:@"%d", [indexPath row]]; return cell; @@ -134,13 +134,13 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - /* - <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; + /* + <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; // ... // Pass the selected object to the new view controller. - [self.navigationController pushViewController:detailViewController animated:YES]; - [detailViewController release]; - */ + [self.navigationController pushViewController:detailViewController animated:YES]; + [detailViewController release]; + */ } diff --git a/Utilities/Release/WiX/CustomAction/.gitattributes b/Utilities/Release/WiX/CustomAction/.gitattributes new file mode 100644 index 0000000000..f632c3f375 --- /dev/null +++ b/Utilities/Release/WiX/CustomAction/.gitattributes @@ -0,0 +1 @@ +exports.def tab-indent diff --git a/bootstrap b/bootstrap index e6d16f05db..6173b3125f 100755 --- a/bootstrap +++ b/bootstrap @@ -1492,6 +1492,7 @@ else cmake_make_processors="${CMAKE_KNOWN_MAKE_PROCESSORS}" fi +tab="`printf '\t'`" TMPFILE="`cmake_tmp_file`_dir" rm -rf "${cmake_bootstrap_dir}/${TMPFILE}" mkdir "${cmake_bootstrap_dir}/${TMPFILE}" @@ -1505,7 +1506,7 @@ build test: cc test.c else echo ' test: test.c - '"${cmake_c_compiler}"' '"${cmake_ld_flags} ${cmake_c_flags}"' -o test test.c +'"${tab}${cmake_c_compiler}"' '"${cmake_ld_flags} ${cmake_c_flags}"' -o test test.c '>"Makefile" fi echo ' @@ -1890,7 +1891,7 @@ write_source_rule() { echo " srcflags = ${src_flags}" >> "${cmake_bootstrap_dir}/build.ninja" else echo "${obj} : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile" - echo " ${compiler} ${flags} ${src_flags} -c ${src} -o ${obj}" >> "${cmake_bootstrap_dir}/Makefile" + echo "${tab}${compiler} ${flags} ${src_flags} -c ${src} -o ${obj}" >> "${cmake_bootstrap_dir}/Makefile" fi } @@ -1937,7 +1938,7 @@ if test "${cmake_bootstrap_generator}" = "Ninja"; then echo " libs = ${libs}" >> "${cmake_bootstrap_dir}/build.ninja" else echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile" - echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} ${libs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile" + echo "${tab}${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} ${libs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile" fi for a in ${CMAKE_CXX_SOURCES}; do src=`cmake_escape_artifact "${cmake_source_dir}/Source/${a}.cxx"` @@ -2000,7 +2001,7 @@ build build.ninja : rebuild_cache else echo " rebuild_cache: - cd \"${cmake_binary_dir}\" && \"${cmake_source_dir}/bootstrap\" --generator=\"${cmake_bootstrap_generator}\" +${tab}cd \"${cmake_binary_dir}\" && \"${cmake_source_dir}/bootstrap\" --generator=\"${cmake_bootstrap_generator}\" " >> "${cmake_bootstrap_dir}/Makefile" fi