Syncing master branch #11
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/victor@3 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…on split. This is the 4th patch 'flightgear-fgaddon_path_fix4_Instruments.patch' attached to the thread at https://sourceforge.net/p/flightgear/mailman/message/33744249/. Due to the spinning out of the aircraft from FGData into the new FGAddon repository, a number of aircraft now either do not work or have missing features due to now incorrect file path assumptions. This fixes the incorrect references to the Aircraft/Instruments/ path for the aircraft 747-200, 787, A-10, a4, AN-225, B-52F, BAC-TSR2, Boeing314, Buccaneer, c310, c310u3a, CanberraBI8, Concorde, dc3, ercoupe, fokker100, Lockheed1049, MiG-15, Noratlas, seahawk, SeaVixen, SenecaII, SU-37, TU-114, victor, vulcanb2, and YF-23. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/victor@544 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…GAddon. This follows from the proposal for deleting the property for all XML files at http://thread.gmane.org/gmane.games.flightgear.devel/77365 and the discussions in the thread at http://thread.gmane.org/gmane.games.flightgear.devel/77606 (for setting up a repository pre-commit hook script for catching this unused property) where deleting the property for all files was discussed. This svn:mime-type repository property is only for optimising the back-end storage size of the db/revs/* files on the SourceForge infrastructure, by allowing certain text files with a very limited number of extremely long lines to be treated as a binary rather than a text file, hence suppressing diffs in the commit. As no one has deliberately set this and many text files in FGAddon are accidentally not being treated as text, this change will result in a major repository clean up which will allow all text files to be treated as text. The activation of the pre-commit hook will prevent this problem from ever reappearing. This change touches the files in 480 aircraft directories out of 485, however this does not affect the file contents or aircraft in any way. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/victor@583 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
This follows from http://thread.gmane.org/gmane.games.flightgear.devel/77932. With the introduction of the 3D sound engine, all sound files in FlightGear now must be mono point sources. The following original sound files have been preserved by renaming to *-stereo.wav, and mono versions created by mixing both channels (as the information content in both stereo channels are different): - Sounds/victor-gear.wav git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/victor@796 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…property from all files.
To avoid the files with the extensions [ac, eff, frag, nas, osgx, svg, txt, vert, xhtml, xml, xsl]
being treated as binary files, as was previously the case, the normal 'svn merge' command was not
used for the reversion. Instead the svn:mime-type property was manually readded to all the binary
file types using the find command together with 'svn propset'. Therefore the svn:mime-type
properties of the files may not always match those from before r583.
find -iname "*.wav" -exec svn propset svn:mime-type "audio/x-wav" {} \;
find -iname "*.bmp*" -exec svn propset svn:mime-type "image/x-ms-bmp" {} \;
find -iname "*.gif" -exec svn propset svn:mime-type "image/gif" {} \;
find -iname "*.jpg" -exec svn propset svn:mime-type "image/jpeg" {} \;
find -iname "*.png*" -exec svn propset svn:mime-type "image/png" {} \;
find -iname "*.psd" -exec svn propset svn:mime-type "image/vnd.adobe.photoshop" {} \;
find -iname "*.tif" -exec svn propset svn:mime-type "image/tiff" {} \;
find -iname "*.xcf" -exec svn propset svn:mime-type "image/x-xcf" {} \;
find -iname "*.rgb*" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.au" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.*af" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.3ds" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.blend*" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.dds" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.od[gst]" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.onetoc2" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.xlsx" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.pdf" -exec svn propset svn:mime-type "application/pdf" {} \;
find -iname "*.ps" -exec svn propset svn:mime-type "application/postscript" {} \;
find -iname "*.gz" -exec svn propset svn:mime-type "application/x-gzip" {} \;
find -iname "*.mdl" -exec svn propset svn:mime-type "application/x-dosexec" {} \;
find -iname "*.zip" -exec svn propset svn:mime-type "application/zip" {} \;
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/victor@997 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…property from all files.
To avoid the files with the extensions [ac, eff, frag, nas, osgx, svg, txt, vert, xhtml, xml, xsl]
being treated as binary files, as was previously the case, the normal 'svn merge' command was not
used for the reversion. Instead the svn:mime-type property was manually readded to all the binary
file types using the find command together with 'svn propset'. Therefore the svn:mime-type
properties of the files may not always match those from before r583.
find -iname "*.wav" -exec svn propset svn:mime-type "audio/x-wav" {} \;
find -iname "*.bmp*" -exec svn propset svn:mime-type "image/x-ms-bmp" {} \;
find -iname "*.gif" -exec svn propset svn:mime-type "image/gif" {} \;
find -iname "*.jpg" -exec svn propset svn:mime-type "image/jpeg" {} \;
find -iname "*.png*" -exec svn propset svn:mime-type "image/png" {} \;
find -iname "*.psd" -exec svn propset svn:mime-type "image/vnd.adobe.photoshop" {} \;
find -iname "*.tif" -exec svn propset svn:mime-type "image/tiff" {} \;
find -iname "*.xcf" -exec svn propset svn:mime-type "image/x-xcf" {} \;
find -iname "*.rgb*" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.au" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.*af" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.3ds" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.blend*" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.dds" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.od[gst]" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.onetoc2" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.xlsx" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.pdf" -exec svn propset svn:mime-type "application/pdf" {} \;
find -iname "*.ps" -exec svn propset svn:mime-type "application/postscript" {} \;
find -iname "*.gz" -exec svn propset svn:mime-type "application/x-gzip" {} \;
find -iname "*.mdl" -exec svn propset svn:mime-type "application/x-dosexec" {} \;
find -iname "*.zip" -exec svn propset svn:mime-type "application/zip" {} \;
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/victor@997 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.