Main Restorations Software Audio/Jukebox/MP3 Everything Else Buy/Sell/Trade
Project Announcements Monitor/Video GroovyMAME Merit/JVL Touchscreen Meet Up Retail Vendors
Driving & Racing Woodworking Software Support Forums Consoles Project Arcade Reviews
Automated Projects Artwork Frontend Support Forums Pinball Forum Discussion Old Boards
Raspberry Pi & Dev Board controls.dat Linux Miscellaneous Arcade Wiki Discussion Old Archives
Lightguns Arcade1Up Try the site in https mode Site News

Unread posts | New Replies | Recent posts | Rules | Chatroom | Wiki | File Repository | RSS | Submit news

  

Author Topic: Diff question?  (Read 1235 times)

0 Members and 1 Guest are viewing this topic.

creatine28

  • Trade Count: (0)
  • Full Member
  • ***
  • Offline Offline
  • Posts: 481
  • Last login:July 26, 2012, 03:41:48 pm
  • Which way to the Arcade?
Diff question?
« on: December 10, 2003, 02:12:01 pm »
I'm making my own build of mame (For Personal use)and I was wondering if there's a way to create a Diff file that will capture only the new added stuff and not try to remove anything while  patching the Diff file to mame source?

Here's the command I'm using to create the DIFF

diff -r -n -U3 oldsource newsource <newdiff.dif

Thanks!
« Last Edit: December 10, 2003, 04:17:59 pm by creatine28 »

Lilwolf

  • Trade Count: (+1)
  • Full Member
  • ***
  • Offline Offline
  • Posts: 4945
  • Last login:July 31, 2022, 10:26:34 pm
Re:Diff question?
« Reply #1 on: December 10, 2003, 04:21:39 pm »
I believe people use diff to keep track of their differences... Not mames

I'm still waiting for someone to open up a CVS for mame source since it handles all this for you.

u_rebelscum

  • Trade Count: (0)
  • Full Member
  • ***
  • Offline Offline
  • Posts: 3633
  • Last login:April 21, 2010, 03:06:26 pm
  • You rebel scum
    • Mame:Analog+
Re:Diff question?
« Reply #2 on: December 10, 2003, 09:32:30 pm »
I'm making my own build of mame (For Personal use)and I was wondering if there's a way to create a Diff file that will capture only the new added stuff and not try to remove anything while  patching the Diff file to mame source?

Here's the command I'm using to create the DIFF

diff -r -n -U3 oldsource newsource <newdiff.dif

Thanks!

Might be just a a typo, but you want the less than sign to be a greater than sign:

diff -r -n -U3 oldsource newsource >newdiff.dif


I'm not exactly sure what you are trying to do (why so worried about removing stuff?).  But here's some general tips about making diffs of your own edits.
  • use the same version of the official mame as the oldsource
  • use your source as the newsource
  • after applying the diff to the new mame, check for any errors, and fix them
  • always make a new diff with the new versions, even if you didn't need to fix anything
  • advanced: learn to read the diff file, and edit out stuff you don't want/need to change before applying the diff.
Robin
Knowledge is Power

creatine28

  • Trade Count: (0)
  • Full Member
  • ***
  • Offline Offline
  • Posts: 481
  • Last login:July 26, 2012, 03:41:48 pm
  • Which way to the Arcade?
Re:Diff question?
« Reply #3 on: December 11, 2003, 02:30:19 pm »
Cool thanks!


I'm basically just like messing around with the source and wanted to see about adding some hack games along with Smooth mame and Analog mame.  Kind of like Gates of Bill's mame build.  Not planning on releasing, just want to dabble in the source and make changes for my own use.


Steve