CRLF fixes, .gitattributes file updated

diff --git a/.gitattributes b/.gitattributes
index c9a3366ef92a062fad3a362e1efe837052b0f9a0..6cd31cea10018fda7e0381bff6335454c7507e88 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,20 +1,29 @@
 * -crlf
 
 * -crlf
 

+*.0 -diff -crlf
+*.1 crlf=input
+*.3 crlf=input

 *.7z -diff -crlf
 *.ac crlf=input
 *.7z -diff -crlf
 *.ac crlf=input

+*.a -diff -crlf

 *.afm crlf=input
 *.aft crlf=input
 *.afm crlf=input
 *.aft crlf=input

+*.ai -diff -crlf

 *.aliases crlf=input
 all crlf=input
 *.am crlf=input
 *.animinfo crlf=input
 *.aps -diff -crlf
 *.aliases crlf=input
 all crlf=input
 *.am crlf=input
 *.animinfo crlf=input
 *.aps -diff -crlf

+*.asc -diff -crlf

 *.ase -crlf
 *.bat -crlf
 *.bgs crlf=input
 *.ase -crlf
 *.bat -crlf
 *.bgs crlf=input

+*.blend1 -diff -crlf

 *.blend -diff -crlf
 *.blend -diff -crlf

+blind_id -diff -crlf

 *.bmp -diff -crlf
 branch-manager crlf=input
 *.bmp -diff -crlf
 branch-manager crlf=input

+*.brand crlf=input

 BSDmakefile crlf=input
 bsp2ent crlf=input
 *.bsp -diff -crlf
 BSDmakefile crlf=input
 bsp2ent crlf=input
 *.bsp -diff -crlf


@@ -26,6 +35,7 @@ bsp2ent crlf=input
 *.cg crlf=input
 ChangeLog crlf=input
 CHANGES crlf=input
 *.cg crlf=input
 ChangeLog crlf=input
 CHANGES crlf=input

+cjpeg -diff -crlf

 COMPILING crlf=input
 compress-texture crlf=input
 *.conf crlf=input
 COMPILING crlf=input
 compress-texture crlf=input
 *.conf crlf=input


@@ -33,20 +43,22 @@ CONTRIBUTORS crlf=input
 COPYING crlf=input
 *.cpp crlf=input
 create crlf=input
 COPYING crlf=input
 *.cpp crlf=input
 create crlf=input

+*.cron crlf=input

 *.css crlf=input
 *.css crlf=input

-Current -diff -crlf
-*.cvsignore crlf=input

 *.cvswrappers crlf=input
 *.cvswrappers crlf=input

-*.dat -diff -crlf
+*.d0pk -diff -crlf

 *.db -diff -crlf
 *.default crlf=input
 *.def crlf=input
 *.dem -diff -crlf
 *.dev -crlf
 *.db -diff -crlf
 *.default crlf=input
 *.def crlf=input
 *.dem -diff -crlf
 *.dev -crlf

+dir -diff -crlf
+djpeg -diff -crlf

 *.dll -diff -crlf
 DOCS -diff -crlf
 *.dot crlf=input
 DoxyConfig crlf=input
 *.dll -diff -crlf
 DOCS -diff -crlf
 *.dot crlf=input
 DoxyConfig crlf=input

+doxyfile crlf=input

 Doxyfile crlf=input
 *.doxygen crlf=input
 *.dpm -diff -crlf
 Doxyfile crlf=input
 *.doxygen crlf=input
 *.dpm -diff -crlf


@@ -54,11 +66,13 @@ Doxyfile crlf=input
 *.dsw -crlf
 *.dtd crlf=input
 *.dylib -diff -crlf
 *.dsw -crlf
 *.dtd crlf=input
 *.dylib -diff -crlf

+empty -diff -crlf

 *.EncoderPlugin crlf=input
 *.EncoderPlugin crlf=input

-*.ent -crlf
+*.flac -diff -crlf

 *.form crlf=input
 *.framegroups crlf=input
 *.game crlf=input
 *.form crlf=input
 *.framegroups crlf=input
 *.game crlf=input

+*.gdb crlf=input

 gendox crlf=input
 gendoxfunctions crlf=input
 genDoxyfile crlf=input
 gendox crlf=input
 gendoxfunctions crlf=input
 genDoxyfile crlf=input


@@ -68,7 +82,10 @@ git-branch-manager crlf=input
 git-filter-index crlf=input
 git-filter-repository crlf=input
 *.gitignore crlf=input
 git-filter-index crlf=input
 git-filter-repository crlf=input
 *.gitignore crlf=input

+git-pk3-import crlf=input
+git-pk3-merge crlf=input

 git-pullall crlf=input
 git-pullall crlf=input

+git-recurse crlf=input

 git-split-repository crlf=input
 git-svn-checkout crlf=input
 git-svn-update crlf=input
 git-split-repository crlf=input
 git-svn-checkout crlf=input
 git-svn-update crlf=input


@@ -83,24 +100,31 @@ GPL crlf=input
 *.html-part crlf=input
 *.icns -diff -crlf
 *.ico -diff -crlf
 *.html-part crlf=input
 *.icns -diff -crlf
 *.ico -diff -crlf

+*.idl crlf=input

 *.idsoftware crlf=input
 *.inc crlf=input
 *.in crlf=input
 *.idsoftware crlf=input
 *.inc crlf=input
 *.in crlf=input

+*.info-1 -diff -crlf
+*.info-2 -diff -crlf
+*.info -diff -crlf
+*.inl crlf=input

 *.instantaction crlf=input
 *.iqm -diff -crlf
 *.java crlf=input
 *.jhm crlf=input
 *.jnlp crlf=input
 *.instantaction crlf=input
 *.iqm -diff -crlf
 *.java crlf=input
 *.jhm crlf=input
 *.jnlp crlf=input

+jpegtran -diff -crlf

 *.jpg -diff -crlf
 *.jsmooth crlf=input
 *.jpg -diff -crlf
 *.jsmooth crlf=input

+*.la crlf=input

 LGPL crlf=input
 LICENSE crlf=input
 *.lmp -diff -crlf
 *.loaders crlf=input
 *.lso -diff -crlf
 LGPL crlf=input
 LICENSE crlf=input
 *.lmp -diff -crlf
 *.loaders crlf=input
 *.lso -diff -crlf

+*.m4 crlf=input

 makefile crlf=input
 Makefile crlf=input
 makefile crlf=input
 Makefile crlf=input

-*.makespr32 crlf=input

 makespr32 crlf=input
 *.map -crlf filter=mapclean
 *.mapinfo crlf=input
 makespr32 crlf=input
 *.map -crlf filter=mapclean
 *.mapinfo crlf=input


@@ -115,9 +139,7 @@ makespr32 crlf=input
 *.mk crlf=input
 *.mkdir -diff -crlf
 *.mmpz -diff -crlf
 *.mk crlf=input
 *.mkdir -diff -crlf
 *.mmpz -diff -crlf

-*.modinfo crlf=input

 *.modules crlf=input
 *.modules crlf=input

-nexuiz-map-compiler crlf=input

 *.nib -crlf
 *.obj -crlf
 OFFSETS -diff -crlf
 *.nib -crlf
 *.obj -crlf
 OFFSETS -diff -crlf


@@ -126,6 +148,7 @@ OFFSETS -diff -crlf
 pangorc crlf=input
 *.patch crlf=input
 *.patchsets crlf=input
 pangorc crlf=input
 *.patch crlf=input
 *.patchsets crlf=input

+*.pc crlf=input

 *.pcx -diff -crlf
 *.pfb -diff -crlf
 *.pfm -diff -crlf
 *.pcx -diff -crlf
 *.pfb -diff -crlf
 *.pfm -diff -crlf


@@ -147,13 +170,14 @@ POSITIONS -diff -crlf
 *.rb crlf=input
 *.rc2 crlf=input
 *.rc -crlf
 *.rb crlf=input
 *.rc2 crlf=input
 *.rc -crlf

+rdjpgcom -diff -crlf

 *.readme crlf=input
 README crlf=input
 *.rtlights -diff -crlf
 SCHEMA crlf=input
 *.scm crlf=input
 *.readme crlf=input
 README crlf=input
 *.rtlights -diff -crlf
 SCHEMA crlf=input
 *.scm crlf=input

+sdl-config crlf=input

 SDL -diff -crlf
 SDL -diff -crlf

-SDLMain.m crlf=input

 *.shader crlf=input
 *.sh crlf=input
 *.skin crlf=input
 *.shader crlf=input
 *.sh crlf=input
 *.skin crlf=input


@@ -164,7 +188,6 @@ SDLMain.m crlf=input
 *.spr -diff -crlf
 *.src crlf=input
 *.strings crlf=input
 *.spr -diff -crlf
 *.src crlf=input
 *.strings crlf=input

-*.strip crlf=input

 strip crlf=input
 *.svg -diff -crlf
 *.TAB -diff -crlf
 strip crlf=input
 *.svg -diff -crlf
 *.TAB -diff -crlf


@@ -175,19 +198,24 @@ TODO crlf=input
 *.ttf -diff -crlf
 *.TTF -diff -crlf
 *.txt crlf=input
 *.ttf -diff -crlf
 *.TTF -diff -crlf
 *.txt crlf=input

-*.TXT crlf=input

 update-shaderlists crlf=input
 update-shaderlists crlf=input

+*.vbs crlf=input

 *.vcproj -crlf
 *.vcproj -crlf

+versionbuilder crlf=input

 *.wav -diff -crlf
 *.waypoints -diff -crlf
 w crlf=input
 *.width crlf=input
 *.workspace -crlf
 *.wav -diff -crlf
 *.waypoints -diff -crlf
 w crlf=input
 *.width crlf=input
 *.workspace -crlf

+wrjpgcom -diff -crlf

 *.xcf -diff -crlf
 *.xlink crlf=input
 *.xml crlf=input
 xonotic-map-compiler-autobuild crlf=input
 xonotic-map-compiler crlf=input
 *.xcf -diff -crlf
 *.xlink crlf=input
 *.xml crlf=input
 xonotic-map-compiler-autobuild crlf=input
 xonotic-map-compiler crlf=input

+xonotic-map-screenshot crlf=input
+xonotic-osx-agl crlf=input
+xonotic-osx-sdl crlf=input

 *.xpm crlf=input
 *.zip -diff -crlf
 zipdiff crlf=input
 *.xpm crlf=input
 *.zip -diff -crlf
 zipdiff crlf=input

diff --git a/misc/tools/shadescript/shade.vbs b/misc/tools/shadescript/shade.vbs
index e5dc4bed243ec93371c6aa759db6dab6761ec90c..6721aa6ed5ae94c27c7b57054092fb311e712999 100644 (file)
--- a/misc/tools/shadescript/shade.vbs
+++ b/misc/tools/shadescript/shade.vbs
@@ -1,28 +1,28 @@
 option explicit 
 
 
 option explicit 
 
 

-Const ForReading = 1\r
-Const ForWriting = 2\r
-Const ForAppending = 8\r
+Const ForReading = 1
+Const ForWriting = 2
+Const ForAppending = 8

 
 dim CRLF 
 
 
 dim CRLF 
 

-CRLF = Chr(13) & Chr(10)\r
+CRLF = Chr(13) & Chr(10)

 
 

-dim scriptFullName, scriptPath \r
-scriptFullName = WScript.ScriptFullName\r
+dim scriptFullName, scriptPath 
+scriptFullName = WScript.ScriptFullName

 scriptPath = Left ( scriptFullName, InStrRev ( scriptFullName, WScript.ScriptName) - 1 )
 scriptPath = Left ( scriptFullName, InStrRev ( scriptFullName, WScript.ScriptName) - 1 )

-\r
+

 dim objFSO, setfolder, re, shader, objShaderTemplate, shaderTemplate
 dim objFSO, setfolder, re, shader, objShaderTemplate, shaderTemplate

-Set objFSO = CreateObject("Scripting.FileSystemObject")\r
-Set setfolder = objFSO.GetFolder(scriptPath)\r
+Set objFSO = CreateObject("Scripting.FileSystemObject")
+Set setfolder = objFSO.GetFolder(scriptPath)

 Set re = New RegExp
 
 re.IgnoreCase = True
 re.Global = True
 Set re = New RegExp
 
 re.IgnoreCase = True
 re.Global = True

-re.Pattern = ""\r
-\r
-Set shader = objFSO.OpenTextFile (scriptPath & "\" & setfolder.name & ".shader", ForWriting, True)\r
+re.Pattern = ""
+
+Set shader = objFSO.OpenTextFile (scriptPath & "\" & setfolder.name & ".shader", ForWriting, True)

 
 Set objShaderTemplate = objFSO.OpenTextFile(scriptPath & "\template.shader", ForReading)
 shaderTemplate = objShaderTemplate.ReadAll()
 
 Set objShaderTemplate = objFSO.OpenTextFile(scriptPath & "\template.shader", ForReading)
 shaderTemplate = objShaderTemplate.ReadAll()


@@ -30,13 +30,13 @@ shaderTemplate = objShaderTemplate.ReadAll()
 function filetitle(sfilename)
        filetitle = Left(sfilename, len(sfilename) - 4)
 end function 
 function filetitle(sfilename)
        filetitle = Left(sfilename, len(sfilename) - 4)
 end function 

-\r
+

 dim noLightmap, isLiquid, isTransparent, bounceScale, shaderString
 dim shaderHead, shaderTail, shaderQUI, shaderDiffuse, diffuseExtra
 dim subfold, texfile, fn
 
 dim noLightmap, isLiquid, isTransparent, bounceScale, shaderString
 dim shaderHead, shaderTail, shaderQUI, shaderDiffuse, diffuseExtra
 dim subfold, texfile, fn
 

-For Each subfold in setfolder.Subfolders\r
-       ' shader.write "Folder: " & subfold.Name & CRLF\r
+For Each subfold in setfolder.Subfolders
+       ' shader.write "Folder: " & subfold.Name & CRLF

        For Each texfile In subfold.Files
                'Defaults               
                noLightmap              = false
        For Each texfile In subfold.Files
                'Defaults               
                noLightmap              = false


@@ -53,7 +53,7 @@ For Each subfold in setfolder.Subfolders
                
                ' First ignore any extra map or Thumbs.db
                re.Pattern = "_bump.|_gloss.|_norm.|_glow.|Thumbs.db"
                
                ' First ignore any extra map or Thumbs.db
                re.Pattern = "_bump.|_gloss.|_norm.|_glow.|Thumbs.db"

-               if not re.test(texfile.name) then                       \r
+               if not re.test(texfile.name) then                       

                        re.pattern = "decal"
                        if re.test(texfile.name) then
                                noLightmap = true
                        re.pattern = "decal"
                        if re.test(texfile.name) then
                                noLightmap = true


@@ -163,10 +163,10 @@ For Each subfold in setfolder.Subfolders
 
                        
                        shader.write shaderString & CRLF & CRLF
 
                        
                        shader.write shaderString & CRLF & CRLF

-               end if\r
-       Next\r
-Next\r
-shader.Close\r
-\r
-\r
-\r
+               end if
+       Next
+Next
+shader.Close
+
+
+