Jump to content

Wine Sherry Github repository

ErmaC

By ErmaC,
in InsanelyWine

 Share
9 posts in this topic

Recommended Posts

ErmaC
ErmaC
Posted
Posted (edited)

Wine Sherry Github repository

Few tips to keep the repo sync'ed:
The Wine-Sherry repo is locate here: https://github.com/fabiomartino/Wine-Sherry

see post #9

The Original Wine repo is here (a mirror): https://github.com/wine-mirror/wine

to keep the master branch sync'ed with the original/mirror repo... here we are the git command to use

  • cd inside the folder project
    cd Wine-Sherry
  • Be sure you are in the master branch
    ermac@Insanely:~/Documents/Wine-Sherry$ git branch
* develop
  master
ermac@Insanely:~/Documents/Wine-Sherry$
    if not... change to master (we keep sync'ed the master not the develop branch
    ermac@Insanely:~/Documents/Wine-Sherry$ git checkout master
Si è passati al branch 'master'
Your branch is up-to-date with 'origin/master'.
ermac@Insanely:~/Documents/Wine-Sherry$ git branch
  develop
* master
ermac@Insanely:~/Documents/Wine-Sherry$
  • Add a "remote" named upstream that points to https://github.com/wine-mirror/wine repo
    git remote add upstream https://github.com/wine-mirror/wine.git
  • Fetch all missing comits from the remote repo and merge them into our local branch (master)
    ermac@Insanely:~/Documents/Wine-Sherry$ git pull upstream master
remote: Counting objects: 550, done.
remote: Compressing objects: 100% (549/549), done.
remote: Total 550 (delta 304), reused 1 (delta 1), pack-reused 0
Ricezione degli oggetti: 100% (550/550), 1.40 MiB | 667.00 KiB/s, done.
Risoluzione dei delta: 100% (304/304), completed with 1 local objects.
Da https://github.com/wine-mirror/wine
 * branch            master     -> FETCH_HEAD
 * [nuovo branch]    master     -> upstream/master
Aggiornamento di 0922865..39797dc
Fast-forward
 configure                                                                             |   2 +-
 configure.ac                                                                          |   2 +-
 dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec |   8 +-
 dlls/d3d8/device.c                                                                    |   8 +
 dlls/d3d8/swapchain.c                                                                 |   2 +-
 dlls/d3d8/tests/visual.c                                                              | 223 ++++++++++++++++++++++++++
 dlls/d3d9/tests/visual.c                                                              | 394 ++++++++++++++++++++++++++++++++++++++++++++++
 dlls/ddraw/tests/ddraw4.c                                                             | 183 +++++++++++++++++++++
 dlls/ddraw/tests/ddraw7.c                                                             | 203 ++++++++++++++++++++++++
 dlls/dmstyle/Makefile.in                                                              |   1 +
 dlls/dmstyle/dmobject.c                                                               | 185 ++++++++++++++++++++++
 dlls/dmstyle/dmobject.h                                                               |  55 +++++++
 dlls/dmstyle/dmutils.c                                                                |   2 +-
 dlls/dmstyle/style.c                                                                  | 213 +++++++------------------
 dlls/dpnet/address.c                                                                  |  66 +++++++-
 dlls/dpnet/tests/address.c                                                            |  37 ++++-
 dlls/dswave/Makefile.in                                                               |   1 +
 dlls/dswave/dmobject.c                                                                | 185 ++++++++++++++++++++++
 dlls/dswave/dmobject.h                                                                |  55 +++++++
 dlls/dswave/dswave.c                                                                  | 506 ++++++++++++-----------------------------------------------
 dlls/dswave/dswave_private.h                                                          |  31 ----
 dlls/dswave/tests/dswave.c                                                            |  23 ++-
 dlls/dwrite/Makefile.in                                                               |   2 +-
 dlls/dwrite/font.c                                                                    |   2 +-
 dlls/dwrite/freetype.c                                                                | 201 +++++++++++++-----------
 dlls/dwrite/layout.c                                                                  |  13 +-
 dlls/dwrite/tests/font.c                                                              |   4 +-
 dlls/dwrite/tests/layout.c                                                            | 126 +++++++++++++++
 dlls/gdiplus/gdiplus.rc                                                               |   3 +
 dlls/gdiplus/gdiplus.spec                                                             |   2 +-
 dlls/gdiplus/gdiplus11.manifest                                                       |   5 +
 dlls/gdiplus/gdiplus_private.h                                                        |   3 +-
 dlls/gdiplus/image.c                                                                  |   9 ++
 dlls/gdiplus/region.c                                                                 |  99 +++++++++---
 dlls/gdiplus/tests/region.c                                                           |  63 ++++++++
 dlls/ieframe/shellbrowser.c                                                           |   8 +-
 dlls/joy.cpl/Makefile.in                                                              |   2 +-
 dlls/kernel32/file.c                                                                  |  53 ++++++-
 dlls/kernel32/kernel32.spec                                                           |  74 ++++-----
 dlls/kernel32/locale.c                                                                |   7 +
 dlls/kernel32/tests/file.c                                                            |  71 +++++++++
 dlls/kernel32/tests/locale.c                                                          |   6 +-
 dlls/kernel32/tests/time.c                                                            |  69 ++++++++
 dlls/kernel32/time.c                                                                  |  62 +++++++-
 dlls/mmdevapi/tests/Makefile.in                                                       |   2 +-
 dlls/mshtml/Makefile.in                                                               |   3 +-
 dlls/mshtml/htmlwindow.c                                                              |  23 ++-
 dlls/mshtml/mshtml_private.h                                                          |  12 ++
 dlls/mshtml/tests/dom.c                                                               |  65 ++++++++
 dlls/mshtml/xmlhttprequest.c                                                          | 406 +++++++++++++++++++++++++++++++++++++++++++++++
 dlls/msvcirt/msvcirt.c                                                                | 257 ++++++++++++++++++++++++++++--
 dlls/msvcirt/msvcirt.h                                                                |   7 +
 dlls/msvcirt/msvcirt.spec                                                             |  84 +++++-----
 dlls/msvcirt/tests/msvcirt.c                                                          | 170 +++++++++++++++++++-
 dlls/msvcp110/msvcp110.spec                                                           |  48 +++---
 dlls/msvcp120/msvcp120.spec                                                           |  48 +++---
 dlls/msvcp120_app/msvcp120_app.spec                                                   |  48 +++---
 dlls/msvcp60/string.c                                                                 |   8 +-
 dlls/msvcp90/locale.c                                                                 |  92 +++++++++++
 dlls/msvcp90/msvcp90.h                                                                |  11 ++
 dlls/msvcp90/string.c                                                                 |  81 +++++++++-
 dlls/msvcr110/msvcr110.spec                                                           |   4 +-
 dlls/msvcr120/msvcr120.spec                                                           |   4 +-
 dlls/msvcr120_app/msvcr120_app.spec                                                   |   4 +-
 dlls/msvcrt/file.c                                                                    | 262 +++++++++++++++++--------------
 dlls/msvcrt/locale.c                                                                  |  69 +++++++-
 dlls/msvcrt/msvcrt.h                                                                  |  15 +-
 dlls/msvcrt20/msvcrt20.spec                                                           |  84 +++++-----
 dlls/msvcrt40/msvcrt40.spec                                                           |  84 +++++-----
 dlls/ntdll/tests/file.c                                                               |  17 ++
 dlls/oledb32/datainit.c                                                               | 250 +++++++++++++++++++++--------
 dlls/oledb32/tests/database.c                                                         | 217 ++++++++++++++++++++++++-
 dlls/riched20/editor.c                                                                |   2 +-
 dlls/riched20/tests/editor.c                                                          |  44 +++++-
 dlls/riched20/writer.c                                                                |   5 +-
 dlls/setupapi/fakedll.c                                                               |  36 +++--
 dlls/shdocvw/Makefile.in                                                              |   2 +-
 dlls/shell32/tests/shlview.c                                                          |   2 +-
 dlls/shlwapi/tests/ordinal.c                                                          |   6 +-
 dlls/user32/clipboard.c                                                               |  64 ++------
 dlls/user32/tests/clipboard.c                                                         | 155 ++++++++++++++++--
 dlls/wined3d/context.c                                                                |  21 ++-
 dlls/wined3d/resource.c                                                               |   9 ++
 dlls/wined3d/surface.c                                                                |   3 +
 dlls/wined3d/utils.c                                                                  | 106 +++++++++----
 dlls/wineoss.drv/Makefile.in                                                          |   2 +-
 dlls/wshom.ocx/tests/wshom.c                                                          |   9 +-
 dlls/xaudio2_7/Makefile.in                                                            |   2 +
 dlls/xaudio2_7/xaudio_classes.idl                                                     |  28 ++++
 dlls/xaudio2_7/xaudio_dll.c                                                           | 312 ++++++++++++++++++++++++++++++++++--
 include/evntrace.h                                                                    |  31 +++-
 include/gdiplusflat.h                                                                 |   1 +
 include/gdiplustypes.h                                                                |   1 +
 include/winbase.h                                                                     |  32 ++++
 include/wine/server_protocol.h                                                        |  18 ++-
 include/wmistr.h                                                                      |  18 +++
 server/clipboard.c                                                                    |  36 +++--
 server/protocol.def                                                                   |   6 +-
 server/request.h                                                                      |   3 +
 server/trace.c                                                                        |   7 +
 tools/make_specfiles                                                                  |   2 +-
 tools/winebuild/spec32.c                                                              |   8 +-
 102 files changed, 5247 insertions(+), 1368 deletions(-)
 create mode 100644 dlls/dmstyle/dmobject.c
 create mode 100644 dlls/dmstyle/dmobject.h
 create mode 100644 dlls/dswave/dmobject.c
 create mode 100644 dlls/dswave/dmobject.h
 create mode 100644 dlls/gdiplus/gdiplus11.manifest
 create mode 100644 dlls/mshtml/xmlhttprequest.c
 create mode 100644 dlls/xaudio2_7/xaudio_classes.idl
ermac@Insanely:~/Documents/Wine-Sherry$
  • Some info before commit
    ermac@Insanely:~/Documents/Wine-Sherry$ git status
Sul branch master
Il tuo branch è avanti rispetto a 'origin/master' di 77 commit.
  (use "git push" to publish your local commits)
nothing to commit, working directory clean
ermac@Insanely:~/Documents/Wine-Sherry$
  • Push all new commits that where got from upstream into our fork
    ermac@Insanely:~/Documents/Wine-Sherry$ git push origin master
Username for 'https://github.com': fabiomartino
Password for 'https://fabiomartino@github.com': 
Counting objects: 550, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (246/246), done.
Writing objects: 100% (550/550), 233.43 KiB | 0 bytes/s, done.
Total 550 (delta 440), reused 414 (delta 304)
To https://github.com/fabiomartino/Wine-Sherry.git
   0922865..39797dc  master -> master
ermac@Insanely:~/Documents/Wine-Sherry$



Some session log. just to keep track the changes

  • Cloned the develop branch from master.
    ermac@Insanely:~/Documents$ git clone https://github.com/fabiomartino/Wine-Sherry.git
Cloning into 'Wine-Sherry'...
Username for 'https://github.com': fabiomartino
Password for 'https://fabiomartino@github.com':
remote: Counting objects: 783817, done.
remote: Compressing objects: 100% (131926/131926), done.
remote: Total 783817 (delta 649933), reused 783817 (delta 649933), pack-reused 0
Ricezione degli oggetti: 100% (783817/783817), 144.01 MiB | 1.05 MiB/s, done.
Risoluzione dei delta: 100% (649933/649933), done.
Checking connectivity... fatto.
ermac@Insanely:~/Documents$ cd Wine-Sherry/
ermac@Insanely:~/Documents/Wine-Sherry$ ls
aclocal.m4  configure.ac   fonts    LICENSE.OLD   po        tools
ANNOUNCE    COPYING.LIB    include  loader        programs  VERSION
AUTHORS     dlls           libs     Makefile.in   README
configure   documentation  LICENSE  Make.vars.in  server
ermac@Insanely:~/Documents/Wine-Sherry$ git branch
* master
ermac@Insanely:~/Documents/Wine-Sherry$ git checkout -b develop
Switched to a new branch 'develop'
ermac@Insanely:~/Documents/Wine-Sherry$ git push origin develop
Username for 'https://github.com': fabiomartino
Password for 'https://fabiomartino@github.com':
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/fabiomartino/Wine-Sherry.git
 * [new branch]      develop -> develop
ermac@Insanely:~/Documents/Wine-Sherry$
  • I create the Wineskin folder and move (with finder) the zipped App file v1.7
    ermac@Insanely:~/Documents/Wine-Sherry$ git checkout Develop
error: pathspec 'Develop' did not match any file(s) known to git.
ermac@Insanely:~/Documents/Wine-Sherry$ git checkout develop
Branch develop set up to track remote branch develop from origin.
Switched to a new branch 'develop'
ermac@Insanely:~/Documents/Wine-Sherry$ ls -la
totale 924
drwxrwxr-x  13 ermac ermac   4096 giu  9 20:42 .
drwxr-xr-x  10 ermac ermac   4096 giu  9 20:38 ..
-rw-rw-r--   1 ermac ermac  26357 giu  9 20:42 aclocal.m4
-rw-rw-r--   1 ermac ermac  18415 giu  9 20:42 ANNOUNCE
-rw-rw-r--   1 ermac ermac  22271 giu  9 20:42 AUTHORS
-rwxrwxr-x   1 ermac ermac 583717 giu  9 20:42 configure
-rw-rw-r--   1 ermac ermac 134554 giu  9 20:42 configure.ac
-rw-rw-r--   1 ermac ermac  26434 giu  9 20:42 COPYING.LIB
drwxrwxr-x 580 ermac ermac  20480 giu  9 20:42 dlls
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 documentation
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 fonts
drwxrwxr-x   8 ermac ermac   4096 giu  9 22:11 .git
drwxrwxr-x   5 ermac ermac  20480 giu  9 20:42 include
drwxrwxr-x   5 ermac ermac   4096 giu  9 20:42 libs
-rw-rw-r--   1 ermac ermac    824 giu  9 20:42 LICENSE
-rw-rw-r--   1 ermac ermac   1324 giu  9 20:42 LICENSE.OLD
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 loader
-rw-rw-r--   1 ermac ermac   6599 giu  9 20:42 .mailmap
-rw-rw-r--   1 ermac ermac   2577 giu  9 20:42 Makefile.in
-rw-rw-r--   1 ermac ermac   2553 giu  9 20:42 Make.vars.in
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 po
drwxrwxr-x  87 ermac ermac   4096 giu  9 20:42 programs
-rw-rw-r--   1 ermac ermac   5705 giu  9 20:42 README
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 server
drwxrwxr-x  10 ermac ermac   4096 giu  9 20:42 tools
-rw-rw-r--   1 ermac ermac     20 giu  9 20:42 VERSION
ermac@Insanely:~/Documents/Wine-Sherry$ mkdir Wineskin
ermac@Insanely:~/Documents/Wine-Sherry$ git status
Sul branch develop
Your branch is up-to-date with 'origin/develop'.
Untracked files:
  (use "git add <file>..." to include in what will be committed)

    Wineskin/

nothing added to commit but untracked files present (use "git add" to track)
ermac@Insanely:~/Documents/Wine-Sherry$ git add .
ermac@Insanely:~/Documents/Wine-Sherry$ git status
Sul branch develop
Your branch is up-to-date with 'origin/develop'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   Wineskin/Wineskin Winery.app Version 1.7.zip

ermac@Insanely:~/Documents/Wine-Sherry$ git commit -m "Add Wineskin Folder and Archived app v1.7"
[develop cf49b29] Add Wineskin Folder and Archived app v1.7
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Wineskin/Wineskin Winery.app Version 1.7.zip
ermac@Insanely:~/Documents/Wine-Sherry$ git push origin develop
Username for 'https://github.com': fabiomartino
Password for 'https://fabiomartino@github.com':
Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 849.74 KiB | 0 bytes/s, done.
Total 4 (delta 1), reused 0 (delta 0)
To https://github.com/fabiomartino/Wine-Sherry.git
   0922865..cf49b29  develop -> develop
ermac@Insanely:~/Documents/Wine-Sherry$ ls -la
totale 928
drwxrwxr-x  14 ermac ermac   4096 giu  9 22:33 .
drwxr-xr-x  10 ermac ermac   4096 giu  9 20:38 ..
-rw-rw-r--   1 ermac ermac  26357 giu  9 20:42 aclocal.m4
-rw-rw-r--   1 ermac ermac  18415 giu  9 20:42 ANNOUNCE
-rw-rw-r--   1 ermac ermac  22271 giu  9 20:42 AUTHORS
-rwxrwxr-x   1 ermac ermac 583717 giu  9 20:42 configure
-rw-rw-r--   1 ermac ermac 134554 giu  9 20:42 configure.ac
-rw-rw-r--   1 ermac ermac  26434 giu  9 20:42 COPYING.LIB
drwxrwxr-x 580 ermac ermac  20480 giu  9 20:42 dlls
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 documentation
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 fonts
drwxrwxr-x   8 ermac ermac   4096 giu  9 22:37 .git
drwxrwxr-x   5 ermac ermac  20480 giu  9 20:42 include
drwxrwxr-x   5 ermac ermac   4096 giu  9 20:42 libs
-rw-rw-r--   1 ermac ermac    824 giu  9 20:42 LICENSE
-rw-rw-r--   1 ermac ermac   1324 giu  9 20:42 LICENSE.OLD
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 loader
-rw-rw-r--   1 ermac ermac   6599 giu  9 20:42 .mailmap
-rw-rw-r--   1 ermac ermac   2577 giu  9 20:42 Makefile.in
-rw-rw-r--   1 ermac ermac   2553 giu  9 20:42 Make.vars.in
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 po
drwxrwxr-x  87 ermac ermac   4096 giu  9 20:42 programs
-rw-rw-r--   1 ermac ermac   5705 giu  9 20:42 README
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 server
drwxrwxr-x  10 ermac ermac   4096 giu  9 20:42 tools
-rw-rw-r--   1 ermac ermac     20 giu  9 20:42 VERSION
drwxrwxr-x   2 ermac ermac   4096 giu  9 22:33 Wineskin
ermac@Insanely:~/Documents/Wine-Sherry$
  • I create a folder for contain the patches proposed by Slice in this topic --> http://www.insanelymac.com/forum/topic/306533-new-sources-patches-code-snippets/
    ermac@Insanely:~/Documents/Wine-Sherry$ git status
Sul branch develop
Your branch is up-to-date with 'origin/develop'.
nothing to commit, working directory clean
ermac@Insanely:~/Documents/Wine-Sherry$ mkdir patches
ermac@Insanely:~/Documents/Wine-Sherry$ git add .
ermac@Insanely:~/Documents/Wine-Sherry$ git commit -m "Add patch folder"
Sul branch develop
Your branch is up-to-date with 'origin/develop'.
nothing to commit, working directory clean
ermac@Insanely:~/Documents/Wine-Sherry$ ls -la
totale 932
drwxrwxr-x  15 ermac ermac   4096 giu  9 22:56 .
drwxr-xr-x  10 ermac ermac   4096 giu  9 20:38 ..
-rw-rw-r--   1 ermac ermac  26357 giu  9 20:42 aclocal.m4
-rw-rw-r--   1 ermac ermac  18415 giu  9 20:42 ANNOUNCE
-rw-rw-r--   1 ermac ermac  22271 giu  9 20:42 AUTHORS
-rwxrwxr-x   1 ermac ermac 583717 giu  9 20:42 configure
-rw-rw-r--   1 ermac ermac 134554 giu  9 20:42 configure.ac
-rw-rw-r--   1 ermac ermac  26434 giu  9 20:42 COPYING.LIB
drwxrwxr-x 580 ermac ermac  20480 giu  9 20:42 dlls
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 documentation
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 fonts
drwxrwxr-x   8 ermac ermac   4096 giu  9 22:57 .git
drwxrwxr-x   5 ermac ermac  20480 giu  9 20:42 include
drwxrwxr-x   5 ermac ermac   4096 giu  9 20:42 libs
-rw-rw-r--   1 ermac ermac    824 giu  9 20:42 LICENSE
-rw-rw-r--   1 ermac ermac   1324 giu  9 20:42 LICENSE.OLD
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 loader
-rw-rw-r--   1 ermac ermac   6599 giu  9 20:42 .mailmap
-rw-rw-r--   1 ermac ermac   2577 giu  9 20:42 Makefile.in
-rw-rw-r--   1 ermac ermac   2553 giu  9 20:42 Make.vars.in
drwxrwxr-x   2 ermac ermac   4096 giu  9 22:56 patches
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 po
drwxrwxr-x  87 ermac ermac   4096 giu  9 20:42 programs
-rw-rw-r--   1 ermac ermac   5705 giu  9 20:42 README
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 server
drwxrwxr-x  10 ermac ermac   4096 giu  9 20:42 tools
-rw-rw-r--   1 ermac ermac     20 giu  9 20:42 VERSION
drwxrwxr-x   2 ermac ermac   4096 giu  9 22:54 Wineskin
ermac@Insanely:~/Documents/Wine-Sherry$
  • Downloaded and move the patched into the patches folder... then push it to the repo.
    ermac@Insanely:~/Documents/Wine-Sherry$ git status
Sul branch develop
Your branch is up-to-date with 'origin/develop'.
Untracked files:
  (use "git add <file>..." to include in what will be committed)

	patches/

nothing added to commit but untracked files present (use "git add" to track)
ermac@Insanely:~/Documents/Wine-Sherry$ git add .
ermac@Insanely:~/Documents/Wine-Sherry$ git commit -m "Add Slice's patches into patch folder"
[develop fb4376c] Add Slice's patches into patch folder
 11 files changed, 2061 insertions(+)
 create mode 100644 patches/0001-d3dx9_36-Implement_save_volume.txt
 create mode 100644 patches/0002-d3dx9_36-Implement_load_with_triangle_filter.txt
 create mode 100644 patches/d3dx9_36.zip
 create mode 100644 patches/patch-34166.txt
 create mode 100644 patches/patch_EnumDisplayDevicesW.txt
 create mode 100644 patches/patch_d3d9ex_fmt2.txt
 create mode 100644 patches/patch_d3d9ex_wined3d.txt
 create mode 100644 patches/patch_levels.txt
 create mode 100644 patches/patch_make.txt
 create mode 100644 patches/patch_nonapple_card.txt
 create mode 100644 patches/patch_sherry_105.txt.zip
ermac@Insanely:~/Documents/Wine-Sherry$ git push origin develop
Username for 'https://github.com': fabiomartino
Password for 'https://fabiomartino@github.com': 
Counting objects: 14, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 1008.84 KiB | 0 bytes/s, done.
Total 14 (delta 1), reused 0 (delta 0)
To https://github.com/fabiomartino/Wine-Sherry.git
   cf49b29..fb4376c  develop -> develop
ermac@Insanely:~/Documents/Wine-Sherry$
Edited by Slice
Updated.
  • Like 1
Link to comment
Share on other sites
ErmaC
ErmaC
Posted
  • Author
Posted

Well done Slice!

 

ermac@Insanely:~/Documents$ cd Wine-Sherry/
ermac@Insanely:~/Documents/Wine-Sherry$ git status
Sul branch develop
Your branch is up-to-date with 'origin/develop'.
nothing to commit, working directory clean
ermac@Insanely:~/Documents/Wine-Sherry$ git pull origin develop
Username for 'https://github.com': fabiomartino
Password for 'https://fabiomartino@github.com': 
remote: Counting objects: 184, done.
remote: Compressing objects: 100% (84/84), done.
remote: Total 184 (delta 138), reused 146 (delta 100), pack-reused 0
Ricezione degli oggetti: 100% (184/184), 637.50 KiB | 811.00 KiB/s, done.
Risoluzione dei delta: 100% (138/138), completed with 84 local objects.
Da https://github.com/fabiomartino/Wine-Sherry
 * branch            develop    -> FETCH_HEAD
   fb4376c..597360c  develop    -> origin/develop
Aggiornamento di fb4376c..597360c
Fast-forward
 configure                                 |    8 +
 configure.ac                              |    9 +-
 dlls/d3d9/surface.c                       |   10 +-
 dlls/d3dx9_36/Makefile.in                 |    3 +-
 dlls/d3dx9_36/animation.c                 |  455 ++
 dlls/d3dx9_36/core.c                      |    4 +-
 dlls/d3dx9_36/d3d9-dxtn.h                 |   25 +
 dlls/d3dx9_36/d3dx9_36.spec               |   22 +-
 dlls/d3dx9_36/d3dx9_36_private.h          |    4 +
 dlls/d3dx9_36/effect.c                    |   49 +-
 dlls/d3dx9_36/font.c                      |  240 +-
 dlls/d3dx9_36/line.c                      |    4 +-
 dlls/d3dx9_36/mesh.c                      |   69 +-
 dlls/d3dx9_36/render.c                    |    8 +-
 dlls/d3dx9_36/shader.c                    |  157 +-
 dlls/d3dx9_36/skin.c                      |   90 +-
 dlls/d3dx9_36/sprite.c                    |    4 +-
 dlls/d3dx9_36/surface.c                   |  521 +-
 dlls/d3dx9_36/tests/effect.c              |   60 +
 dlls/d3dx9_36/tests/mesh.c                |   83 +
 dlls/d3dx9_36/tests/shader.c              |   86 +
 dlls/d3dx9_36/tests/surface.c             |    8 +-
 dlls/d3dx9_36/tests/texture.c             |   10 +
 dlls/d3dx9_36/tests/volume.c              |    6 +-
 dlls/d3dx9_36/texture.c                   |   21 +-
 dlls/d3dx9_36/volume.c                    |  358 +-
 dlls/d3dx9_36/xfile.c                     |   12 +-
 dlls/dbghelp/path.c                       |    2 +
 dlls/ddraw/main.c                         |    8 +
 dlls/ddraw/surface.c                      |   90 +-
 dlls/dinput/joystick_osx.c                |    2 +-
 dlls/ieframe/client.c                     |    3 +
 dlls/krnl386.exe16/int2f.c                |    4 +-
 dlls/user32/misc.c                        |   12 +-
 dlls/user32/win.c                         |   62 +
 dlls/windowscodecs/stream.c               |    2 +-
 dlls/wined3d-csmt/Makefile.in             |   40 +
 dlls/wined3d-csmt/arb_program_shader.c    | 7906 ++++++++++++++++++++++++++
 dlls/wined3d-csmt/ati_fragment_shader.c   | 1395 +++++
 dlls/wined3d-csmt/buffer.c                | 1610 ++++++
 dlls/wined3d-csmt/context.c               | 3337 +++++++++++
 dlls/wined3d-csmt/cs.c                    | 4085 ++++++++++++++
 dlls/wined3d-csmt/device.c                | 5775 +++++++++++++++++++
 dlls/wined3d-csmt/directx.c               | 5918 +++++++++++++++++++
 dlls/wined3d-csmt/drawprim.c              |  896 +++
 dlls/wined3d-csmt/dxtn.c                  |  531 ++
 dlls/wined3d-csmt/gl_compat.c             |  544 ++
 dlls/wined3d-csmt/glsl_shader.c           | 8472 ++++++++++++++++++++++++++++
 dlls/wined3d-csmt/libwined3d.def          |  288 +
 dlls/wined3d-csmt/nvidia_texture_shader.c |  944 ++++
 dlls/wined3d-csmt/palette.c               |  178 +
 dlls/wined3d-csmt/query.c                 | 1188 ++++
 dlls/wined3d-csmt/resource.c              |  986 ++++
 dlls/wined3d-csmt/sampler.c               |  137 +
 dlls/wined3d-csmt/shader.c                | 2762 +++++++++
 dlls/wined3d-csmt/shader_sm1.c            |  801 +++
 dlls/wined3d-csmt/shader_sm4.c            |  910 +++
 dlls/wined3d-csmt/state.c                 | 6050 ++++++++++++++++++++
 dlls/wined3d-csmt/stateblock.c            | 1501 +++++
 dlls/wined3d-csmt/surface.c               | 7131 +++++++++++++++++++++++
 dlls/wined3d-csmt/swapchain.c             | 1385 +++++
 dlls/wined3d-csmt/texture.c               | 1734 ++++++
 dlls/wined3d-csmt/txc_compress_dxtn.c     |  853 +++
 dlls/wined3d-csmt/txc_dxtn.h              |   55 +
 dlls/wined3d-csmt/txc_fetch_dxtn.c        |  244 +
 dlls/wined3d-csmt/utils.c                 | 4707 ++++++++++++++++
 dlls/wined3d-csmt/version.rc              |   27 +
 dlls/wined3d-csmt/vertexdeclaration.c     |  467 ++
 dlls/wined3d-csmt/view.c                  |  234 +
 dlls/wined3d-csmt/volume.c                | 1005 ++++
 dlls/wined3d-csmt/wined3d-csmt.spec       |  301 +
 dlls/wined3d-csmt/wined3d_gl.h            |  168 +
 dlls/wined3d-csmt/wined3d_main.c          |  604 ++
 dlls/wined3d-csmt/wined3d_private.h       | 3663 ++++++++++++
 dlls/wined3d/Makefile.in                  |    3 +
 dlls/wined3d/context.c                    |    4 +-
 dlls/wined3d/device.c                     |   37 +-
 dlls/wined3d/directx.c                    |  150 +-
 dlls/wined3d/dxtn.c                       |  531 ++
 dlls/wined3d/glsl_shader.c                |    4 +-
 dlls/wined3d/resource.c                   |   53 +-
 dlls/wined3d/shader.c                     |    4 +-
 dlls/wined3d/state.c                      |   24 +-
 dlls/wined3d/surface.c                    |  200 +-
 dlls/wined3d/swapchain.c                  |   15 +-
 dlls/wined3d/texture.c                    |   50 +-
 dlls/wined3d/txc_compress_dxtn.c          |  853 +++
 dlls/wined3d/txc_dxtn.h                   |   55 +
 dlls/wined3d/txc_fetch_dxtn.c             |  244 +
 dlls/wined3d/utils.c                      |   91 +-
 dlls/wined3d/vertexdeclaration.c          |   10 +
 dlls/wined3d/volume.c                     |    2 +-
 dlls/wined3d/wined3d.spec                 |    9 +
 dlls/wined3d/wined3d_gl.h                 |    6 +
 dlls/wined3d/wined3d_main.c               |   52 +
 dlls/wined3d/wined3d_private.h            |   22 +-
 dlls/winemac.drv/display.c                |   19 +-
 dlls/winemac.drv/display.c.rej            |   38 +
 include/commctrl.h                        |    6 +
 include/d3d9types.h                       |   15 +-
 include/d3dx9anim.h                       |    8 +-
 include/d3dx9effect.h                     |    2 +
 include/d3dx9shader.h                     |    1 +
 include/d3dx9tex.h                        |    2 +
 include/windef.h                          |    7 +
 include/wine/library.h                    |    3 +
 include/wine/wined3d.h                    |   20 +
 include/winerror.h                        |    1 +
 programs/winecfg/Makefile.in              |    1 +
 programs/winecfg/main.c                   |   12 +-
 programs/winecfg/resource.h               |    5 +
 programs/winecfg/staging.c                |   89 +
 programs/winecfg/winecfg.h                |    1 +
 programs/winecfg/winecfg.rc               |   10 +
 tools/Makefile.in                         |   12 +-
 tools/makedep.c                           |   77 +-
 116 files changed, 83811 insertions(+), 280 deletions(-)
 create mode 100644 dlls/d3dx9_36/animation.c
 create mode 100644 dlls/d3dx9_36/d3d9-dxtn.h
 create mode 100644 dlls/wined3d-csmt/Makefile.in
 create mode 100644 dlls/wined3d-csmt/arb_program_shader.c
 create mode 100644 dlls/wined3d-csmt/ati_fragment_shader.c
 create mode 100644 dlls/wined3d-csmt/buffer.c
 create mode 100644 dlls/wined3d-csmt/context.c
 create mode 100644 dlls/wined3d-csmt/cs.c
 create mode 100644 dlls/wined3d-csmt/device.c
 create mode 100644 dlls/wined3d-csmt/directx.c
 create mode 100644 dlls/wined3d-csmt/drawprim.c
 create mode 100644 dlls/wined3d-csmt/dxtn.c
 create mode 100644 dlls/wined3d-csmt/gl_compat.c
 create mode 100644 dlls/wined3d-csmt/glsl_shader.c
 create mode 100644 dlls/wined3d-csmt/libwined3d.def
 create mode 100644 dlls/wined3d-csmt/nvidia_texture_shader.c
 create mode 100644 dlls/wined3d-csmt/palette.c
 create mode 100644 dlls/wined3d-csmt/query.c
 create mode 100644 dlls/wined3d-csmt/resource.c
 create mode 100644 dlls/wined3d-csmt/sampler.c
 create mode 100644 dlls/wined3d-csmt/shader.c
 create mode 100644 dlls/wined3d-csmt/shader_sm1.c
 create mode 100644 dlls/wined3d-csmt/shader_sm4.c
 create mode 100644 dlls/wined3d-csmt/state.c
 create mode 100644 dlls/wined3d-csmt/stateblock.c
 create mode 100644 dlls/wined3d-csmt/surface.c
 create mode 100644 dlls/wined3d-csmt/swapchain.c
 create mode 100644 dlls/wined3d-csmt/texture.c
 create mode 100644 dlls/wined3d-csmt/txc_compress_dxtn.c
 create mode 100644 dlls/wined3d-csmt/txc_dxtn.h
 create mode 100644 dlls/wined3d-csmt/txc_fetch_dxtn.c
 create mode 100644 dlls/wined3d-csmt/utils.c
 create mode 100644 dlls/wined3d-csmt/version.rc
 create mode 100644 dlls/wined3d-csmt/vertexdeclaration.c
 create mode 100644 dlls/wined3d-csmt/view.c
 create mode 100644 dlls/wined3d-csmt/volume.c
 create mode 100644 dlls/wined3d-csmt/wined3d-csmt.spec
 create mode 100644 dlls/wined3d-csmt/wined3d_gl.h
 create mode 100644 dlls/wined3d-csmt/wined3d_main.c
 create mode 100644 dlls/wined3d-csmt/wined3d_private.h
 create mode 100644 dlls/wined3d/dxtn.c
 create mode 100644 dlls/wined3d/txc_compress_dxtn.c
 create mode 100644 dlls/wined3d/txc_dxtn.h
 create mode 100644 dlls/wined3d/txc_fetch_dxtn.c
 create mode 100644 dlls/winemac.drv/display.c.rej
 create mode 100644 programs/winecfg/staging.c
ermac@Insanely:~/Documents/Wine-Sherry$ ls -la
totale 932
drwxrwxr-x  15 ermac ermac   4096 giu 10 20:49 .
drwxr-xr-x  10 ermac ermac   4096 giu  9 20:38 ..
-rw-rw-r--   1 ermac ermac  26357 giu  9 20:42 aclocal.m4
-rw-rw-r--   1 ermac ermac  18415 giu  9 20:42 ANNOUNCE
-rw-rw-r--   1 ermac ermac  22271 giu  9 20:42 AUTHORS
-rwxrwxr-x   1 ermac ermac 583878 giu 10 20:49 configure
-rw-rw-r--   1 ermac ermac 134669 giu 10 20:49 configure.ac
-rw-rw-r--   1 ermac ermac  26434 giu  9 20:42 COPYING.LIB
drwxrwxr-x 581 ermac ermac  20480 giu 10 20:49 dlls
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 documentation
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 fonts
drwxrwxr-x   8 ermac ermac   4096 giu 10 20:49 .git
drwxrwxr-x   5 ermac ermac  20480 giu 10 20:49 include
drwxrwxr-x   5 ermac ermac   4096 giu  9 20:42 libs
-rw-rw-r--   1 ermac ermac    824 giu  9 20:42 LICENSE
-rw-rw-r--   1 ermac ermac   1324 giu  9 20:42 LICENSE.OLD
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 loader
-rw-rw-r--   1 ermac ermac   6599 giu  9 20:42 .mailmap
-rw-rw-r--   1 ermac ermac   2577 giu  9 20:42 Makefile.in
-rw-rw-r--   1 ermac ermac   2553 giu  9 20:42 Make.vars.in
drwxrwxr-x   2 ermac ermac   4096 giu  9 23:21 patches
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 po
drwxrwxr-x  87 ermac ermac   4096 giu  9 20:42 programs
-rw-rw-r--   1 ermac ermac   5705 giu  9 20:42 README
drwxrwxr-x   2 ermac ermac   4096 giu  9 20:42 server
drwxrwxr-x  10 ermac ermac   4096 giu 10 20:49 tools
-rw-rw-r--   1 ermac ermac     20 giu  9 20:42 VERSION
drwxrwxr-x   2 ermac ermac   4096 giu  9 22:54 Wineskin
ermac@Insanely:~/Documents/Wine-Sherry$
ErmaC
Link to comment
Share on other sites
ErmaC
ErmaC
Posted
  • Author
Posted

Ok I remove the wineskin app and add the source code.

Last login: Wed Jun 10 21:41:31 on console
InsanelyMac:~ fabio$ pwd
/Users/fabio
Documents/ Downloads/ 
InsanelyMac:~ fabio$ cd Documents/
InsanelyMac:Documents fabio$ ls -la
total 64
drwx------+  6 fabio  staff    204 10 Jun 22:09 .
drwxr-xr-x+ 21 fabio  staff    714 10 Jun 21:41 ..
-rw-r--r--@  1 fabio  staff   6148 10 Jun 22:09 .DS_Store
-rw-------   1 fabio  staff      0 26 May 20:20 .localized
InsanelyMac:Documents fabio$ git clone https://github.com/fabiomartino/Wine-Sherry.git
Cloning into 'Wine-Sherry'...
remote: Counting objects: 784043, done.
remote: Compressing objects: 100% (132089/132089), done.
remote: Total 784043 (delta 650077), reused 783962 (delta 649996), pack-reused 0
Receiving objects: 100% (784043/784043), 146.76 MiB | 1.07 MiB/s, done.
Resolving deltas: 100% (650077/650077), done.
Checking connectivity... done.
Checking out files: 100% (6605/6605), done.
InsanelyMac:Documents fabio$ cd Wine-Sherry/
InsanelyMac:Wine-Sherry fabio$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
InsanelyMac:Wine-Sherry fabio$ git checkout develop
Branch develop set up to track remote branch develop from origin.
Switched to a new branch 'develop'
InsanelyMac:Wine-Sherry fabio$ git pull origin develop
From https://github.com/fabiomartino/Wine-Sherry
 * branch            develop    -> FETCH_HEAD
Already up-to-date.
InsanelyMac:Wine-Sherry fabio$ git branch
* develop
  master
InsanelyMac:Wine-Sherry fabio$ ls
ANNOUNCE	LICENSE		Makefile.in	Wineskin	configure.ac	fonts		loader		programs
AUTHORS		LICENSE.OLD	README		aclocal.m4	dlls		include		patches		server
COPYING.LIB	Make.vars.in	VERSION		configure	documentation	libs		po		tools
InsanelyMac:Wine-Sherry fabio$ cd Wineskin/
InsanelyMac:Wineskin fabio$ ls
Wineskin Winery				Wineskin Winery.app Version 1.7.zip	WineskinApp				WineskinLauncher
InsanelyMac:Wineskin fabio$ ls -la
total 1712
drwxr-xr-x   8 fabio  staff     272 10 Jun 22:29 .
drwxr-xr-x  29 fabio  staff     986 10 Jun 22:26 ..
drwxr-xr-x  13 fabio  staff     442 10 Jun 22:28 .git
-rw-r--r--   1 fabio  staff     829 10 Jun 22:29 .gitignore
drwxr-xr-x  16 fabio  staff     544 10 Jun 22:17 Wineskin Winery
-rw-r--r--   1 fabio  staff  872418 10 Jun 22:26 Wineskin Winery.app Version 1.7.zip
drwxr-xr-x  20 fabio  staff     680 10 Jun 22:17 WineskinApp
drwxr-xr-x  11 fabio  staff     374 10 Jun 22:17 WineskinLauncher
InsanelyMac:Wineskin fabio$ cd ..
InsanelyMac:Wine-Sherry fabio$ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	deleted:    Wineskin/Wineskin Winery.app Version 1.7.zip

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	Wineskin/.gitignore
	Wineskin/Wineskin Winery/
	Wineskin/WineskinApp/
	Wineskin/WineskinLauncher/

no changes added to commit (use "git add" and/or "git commit -a")
InsanelyMac:Wine-Sherry fabio$ git rm "Wineskin/Wineskin Winery.app Version 1.7.zip"
rm 'Wineskin/Wineskin Winery.app Version 1.7.zip'
InsanelyMac:Wine-Sherry fabio$ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	deleted:    Wineskin/Wineskin Winery.app Version 1.7.zip

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	Wineskin/

InsanelyMac:Wine-Sherry fabio$ git commit -m "Revove Zipped Wineskin Winery app"
[develop 0dc4c33] Revove Zipped Wineskin Winery app
 Committer: Fabio Martino <fabio@insanelymac.home>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:

    git config --global --edit

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Wineskin/Wineskin Winery.app Version 1.7.zip
InsanelyMac:Wine-Sherry fabio$ git status
On branch develop
Your branch is ahead of 'origin/develop' by 1 commit.
  (use "git push" to publish your local commits)
Untracked files:
  (use "git add <file>..." to include in what will be committed)

	Wineskin/

nothing added to commit but untracked files present (use "git add" to track)
InsanelyMac:Wine-Sherry fabio$ git push origin develop
Counting objects: 2, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 252 bytes | 0 bytes/s, done.
Total 2 (delta 1), reused 0 (delta 0)
To https://github.com/fabiomartino/Wine-Sherry.git
   e011ce7..0dc4c33  develop -> develop
InsanelyMac:Wine-Sherry fabio$ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
Untracked files:
  (use "git add <file>..." to include in what will be committed)

	Wineskin/

nothing added to commit but untracked files present (use "git add" to track)
InsanelyMac:Wine-Sherry fabio$ git add Wineskin/
InsanelyMac:Wine-Sherry fabio$ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	new file:   Wineskin/.gitignore
	new file:   Wineskin/Wineskin Winery/7za
	new file:   Wineskin/Wineskin Winery/English.lproj/InfoPlist.strings
	new file:   Wineskin/Wineskin Winery/English.lproj/MainMenu.xib
	new file:   Wineskin/Wineskin Winery/Winery.icns
	new file:   Wineskin/Wineskin Winery/Wineskin Winery.entitlements
	new file:   Wineskin/Wineskin Winery/Wineskin Winery.xcodeproj/project.pbxproj
	new file:   Wineskin/Wineskin Winery/Wineskin Winery.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	new file:   Wineskin/Wineskin Winery/Wineskin Winery.xcodeproj/project.xcworkspace/xcshareddata/Wineskin Winery.xccheckout
	new file:   Wineskin/Wineskin Winery/Wineskin.h
	new file:   Wineskin/Wineskin Winery/Wineskin.m
	new file:   Wineskin/Wineskin Winery/WineskinBanner.jpg
	new file:   Wineskin/Wineskin Winery/WineskinWineryUpdater
	new file:   Wineskin/Wineskin Winery/Wineskin_Winery-Info.plist
	new file:   Wineskin/Wineskin Winery/Wineskin_WineryAppDelegate.h
	new file:   Wineskin/Wineskin Winery/Wineskin_WineryAppDelegate.m
	new file:   Wineskin/Wineskin Winery/Wineskin_Winery_Prefix.pch
	new file:   Wineskin/Wineskin Winery/main.m
	new file:   Wineskin/WineskinApp/Command Line Wine Test
	new file:   Wineskin/WineskinApp/CustomEXE.app/Contents/Info.plist
	new file:   Wineskin/WineskinApp/CustomEXE.app/Contents/Info.plist.cexe
	new file:   Wineskin/WineskinApp/CustomEXE.app/Contents/MacOS/CustomEXE
	new file:   Wineskin/WineskinApp/CustomEXE.app/Contents/Resources/Wineskin.icns
	new file:   Wineskin/WineskinApp/CustomEXE.app/Contents/_CodeSignature/CodeRequirements
	new file:   Wineskin/WineskinApp/CustomEXE.app/Contents/_CodeSignature/CodeResources
	new file:   Wineskin/WineskinApp/Defaults.plist
	new file:   Wineskin/WineskinApp/English.lproj/InfoPlist.strings
	new file:   Wineskin/WineskinApp/English.lproj/MainMenu.xib
	new file:   Wineskin/WineskinApp/IconDragAndDrop.h
	new file:   Wineskin/WineskinApp/IconDragAndDrop.m
	new file:   Wineskin/WineskinApp/WSGamma
	new file:   Wineskin/WineskinApp/Wineskin-Info.plist
	new file:   Wineskin/WineskinApp/Wineskin.icns
	new file:   Wineskin/WineskinApp/Wineskin.xcodeproj/project.pbxproj
	new file:   Wineskin/WineskinApp/Wineskin.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	new file:   Wineskin/WineskinApp/Wineskin.xcodeproj/project.xcworkspace/xcshareddata/Wineskin.xccheckout
	new file:   Wineskin/WineskinApp/WineskinAppDelegate.h
	new file:   Wineskin/WineskinApp/WineskinAppDelegate.m
	new file:   Wineskin/WineskinApp/WineskinBanner.jpg
	new file:   Wineskin/WineskinApp/WineskinBanner2.jpg
	new file:   Wineskin/WineskinApp/Wineskin_Prefix.pch
	new file:   Wineskin/WineskinApp/Winetricks/cabextract
	new file:   Wineskin/WineskinApp/Winetricks/winetricks
	new file:   Wineskin/WineskinApp/Winetricks/winetricksHelpList.plist
	new file:   Wineskin/WineskinApp/main.m
	new file:   Wineskin/WineskinApp/remakedefaults.reg
	new file:   Wineskin/WineskinLauncher/English.lproj/InfoPlist.strings
	new file:   Wineskin/WineskinLauncher/English.lproj/MainMenu.xib
	new file:   Wineskin/WineskinLauncher/WineStart.h
	new file:   Wineskin/WineskinLauncher/WineStart.m
	new file:   Wineskin/WineskinLauncher/WineskinLauncher-Info.plist
	new file:   Wineskin/WineskinLauncher/WineskinLauncher.xcodeproj/project.pbxproj
	new file:   Wineskin/WineskinLauncher/WineskinLauncher.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	new file:   Wineskin/WineskinLauncher/WineskinLauncher.xcodeproj/project.xcworkspace/xcshareddata/WineskinLauncher.xccheckout
	new file:   Wineskin/WineskinLauncher/WineskinLauncherAppDelegate.h
	new file:   Wineskin/WineskinLauncher/WineskinLauncherAppDelegate.m
	new file:   Wineskin/WineskinLauncher/WineskinLauncher_Prefix.pch
	new file:   Wineskin/WineskinLauncher/main.m

InsanelyMac:Wine-Sherry fabio$ git commit -m "Merge source code for Wineskin"
[develop 649366c] Merge source code for Wineskin
 Committer: Fabio Martino <fabio@insanelymac.home>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:

    git config --global --edit

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 58 files changed, 40586 insertions(+)
 create mode 100644 Wineskin/.gitignore
 create mode 100755 Wineskin/Wineskin Winery/7za
 create mode 100644 Wineskin/Wineskin Winery/English.lproj/InfoPlist.strings
 create mode 100644 Wineskin/Wineskin Winery/English.lproj/MainMenu.xib
 create mode 100644 Wineskin/Wineskin Winery/Winery.icns
 create mode 100644 Wineskin/Wineskin Winery/Wineskin Winery.entitlements
 create mode 100644 Wineskin/Wineskin Winery/Wineskin Winery.xcodeproj/project.pbxproj
 create mode 100644 Wineskin/Wineskin Winery/Wineskin Winery.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 Wineskin/Wineskin Winery/Wineskin Winery.xcodeproj/project.xcworkspace/xcshareddata/Wineskin Winery.xccheckout
 create mode 100644 Wineskin/Wineskin Winery/Wineskin.h
 create mode 100644 Wineskin/Wineskin Winery/Wineskin.m
 create mode 100644 Wineskin/Wineskin Winery/WineskinBanner.jpg
 create mode 100755 Wineskin/Wineskin Winery/WineskinWineryUpdater
 create mode 100644 Wineskin/Wineskin Winery/Wineskin_Winery-Info.plist
 create mode 100644 Wineskin/Wineskin Winery/Wineskin_WineryAppDelegate.h
 create mode 100644 Wineskin/Wineskin Winery/Wineskin_WineryAppDelegate.m
 create mode 100644 Wineskin/Wineskin Winery/Wineskin_Winery_Prefix.pch
 create mode 100644 Wineskin/Wineskin Winery/main.m
 create mode 100755 Wineskin/WineskinApp/Command Line Wine Test
 create mode 100644 Wineskin/WineskinApp/CustomEXE.app/Contents/Info.plist
 create mode 100755 Wineskin/WineskinApp/CustomEXE.app/Contents/Info.plist.cexe
 create mode 100755 Wineskin/WineskinApp/CustomEXE.app/Contents/MacOS/CustomEXE
 create mode 100644 Wineskin/WineskinApp/CustomEXE.app/Contents/Resources/Wineskin.icns
 create mode 100644 Wineskin/WineskinApp/CustomEXE.app/Contents/_CodeSignature/CodeRequirements
 create mode 100644 Wineskin/WineskinApp/CustomEXE.app/Contents/_CodeSignature/CodeResources
 create mode 100755 Wineskin/WineskinApp/Defaults.plist
 create mode 100644 Wineskin/WineskinApp/English.lproj/InfoPlist.strings
 create mode 100644 Wineskin/WineskinApp/English.lproj/MainMenu.xib
 create mode 100644 Wineskin/WineskinApp/IconDragAndDrop.h
 create mode 100644 Wineskin/WineskinApp/IconDragAndDrop.m
 create mode 100755 Wineskin/WineskinApp/WSGamma
 create mode 100644 Wineskin/WineskinApp/Wineskin-Info.plist
 create mode 100644 Wineskin/WineskinApp/Wineskin.icns
 create mode 100644 Wineskin/WineskinApp/Wineskin.xcodeproj/project.pbxproj
 create mode 100644 Wineskin/WineskinApp/Wineskin.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 Wineskin/WineskinApp/Wineskin.xcodeproj/project.xcworkspace/xcshareddata/Wineskin.xccheckout
 create mode 100644 Wineskin/WineskinApp/WineskinAppDelegate.h
 create mode 100644 Wineskin/WineskinApp/WineskinAppDelegate.m
 create mode 100644 Wineskin/WineskinApp/WineskinBanner.jpg
 create mode 100644 Wineskin/WineskinApp/WineskinBanner2.jpg
 create mode 100644 Wineskin/WineskinApp/Wineskin_Prefix.pch
 create mode 100755 Wineskin/WineskinApp/Winetricks/cabextract
 create mode 100755 Wineskin/WineskinApp/Winetricks/winetricks
 create mode 100644 Wineskin/WineskinApp/Winetricks/winetricksHelpList.plist
 create mode 100644 Wineskin/WineskinApp/main.m
 create mode 100644 Wineskin/WineskinApp/remakedefaults.reg
 create mode 100644 Wineskin/WineskinLauncher/English.lproj/InfoPlist.strings
 create mode 100644 Wineskin/WineskinLauncher/English.lproj/MainMenu.xib
 create mode 100644 Wineskin/WineskinLauncher/WineStart.h
 create mode 100644 Wineskin/WineskinLauncher/WineStart.m
 create mode 100644 Wineskin/WineskinLauncher/WineskinLauncher-Info.plist
 create mode 100644 Wineskin/WineskinLauncher/WineskinLauncher.xcodeproj/project.pbxproj
 create mode 100644 Wineskin/WineskinLauncher/WineskinLauncher.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 Wineskin/WineskinLauncher/WineskinLauncher.xcodeproj/project.xcworkspace/xcshareddata/WineskinLauncher.xccheckout
 create mode 100644 Wineskin/WineskinLauncher/WineskinLauncherAppDelegate.h
 create mode 100644 Wineskin/WineskinLauncher/WineskinLauncherAppDelegate.m
 create mode 100644 Wineskin/WineskinLauncher/WineskinLauncher_Prefix.pch
 create mode 100644 Wineskin/WineskinLauncher/main.m
InsanelyMac:Wine-Sherry fabio$ git push origin develop
Counting objects: 78, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (73/73), done.
Writing objects: 100% (78/78), 1.13 MiB | 157.00 KiB/s, done.
Total 78 (delta 13), reused 0 (delta 0)
To https://github.com/fabiomartino/Wine-Sherry.git
   0dc4c33..649366c  develop -> develop
InsanelyMac:Wine-Sherry fabio$
ErmaC
Link to comment
Share on other sites
ErmaC
ErmaC
Posted
  • Author
Posted 
InsanelyMac:Documents fabio$ cd Wine-Sherry/

InsanelyMac:Wine-Sherry fabio$ git branch

* develop

  master

InsanelyMac:Wine-Sherry fabio$ git status

On branch develop

Your branch is up-to-date with 'origin/develop'.

nothing to commit, working directory clean

InsanelyMac:Wine-Sherry fabio$ git pull origin develop

remote: Counting objects: 37, done.

remote: Compressing objects: 100% (17/17), done.

remote: Total 37 (delta 29), reused 28 (delta 20), pack-reused 0

Unpacking objects: 100% (37/37), done.

From https://github.com/fabiomartino/Wine-Sherry

 * branch            develop    -> FETCH_HEAD

   649366c..9272132  develop    -> origin/develop

Updating 649366c..9272132

Fast-forward

 dlls/.DS_Store                  |  Bin 6148 -> 0 bytes

 dlls/kernel32/file.c            |    7 +-

 dlls/kernel32/sync.c            |    3 +-

 dlls/kernel32/sync.c.orig       | 2449 ++++++++++++++++++++++++++

 dlls/kernel32/tests/pipe.c      | 1324 +++++++++++++-

 dlls/kernel32/tests/pipe.c.orig | 3073 ++++++++++++++++++++++++++++++++

 dlls/ntdll/.DS_Store            |  Bin 6148 -> 0 bytes

 dlls/ntdll/directory.c.orig     | 3418 ------------------------------------

 dlls/ntdll/file.c               |  344 ++--

 dlls/ntdll/file.c.orig          | 3674 +++++++++++++++++++++++++++++++++++++++

 dlls/ntdll/file.c.rej           |   49 +

 dlls/ntdll/loader.c.orig        | 3132 ---------------------------------

 dlls/ntdll/ntdll_misc.h.orig    |  271 ---

 dlls/winemac.drv/cocoa_window.m |   55 -

 include/wine/server_protocol.h  |    9 +-

 server/named_pipe.c             |  116 +-

 server/named_pipe.c.orig        | 1064 ++++++++++++

 server/protocol.def             |    1 +

 server/protocol.def.orig        | 3611 ++++++++++++++++++++++++++++++++++++++

 server/request.h                |    3 +-

 server/sock.c                   |    4 +-

 server/sock.c.orig              | 1385 +++++++++++++++

 server/sock.h                   |   26 +

 server/trace.c                  |    1 +

 24 files changed, 16936 insertions(+), 7083 deletions(-)

 delete mode 100644 dlls/.DS_Store

 create mode 100644 dlls/kernel32/sync.c.orig

 create mode 100644 dlls/kernel32/tests/pipe.c.orig

 delete mode 100644 dlls/ntdll/.DS_Store

 delete mode 100644 dlls/ntdll/directory.c.orig

 create mode 100644 dlls/ntdll/file.c.orig

 create mode 100644 dlls/ntdll/file.c.rej

 delete mode 100644 dlls/ntdll/loader.c.orig

 delete mode 100644 dlls/ntdll/ntdll_misc.h.orig

 create mode 100644 server/named_pipe.c.orig

 create mode 100644 server/protocol.def.orig

 create mode 100644 server/sock.c.orig

 create mode 100644 server/sock.h

InsanelyMac:Wine-Sherry fabio$
Link to comment
Share on other sites
  • 2 weeks later...
ErmaC
ErmaC
Posted
  • Author
Posted

How to merge remote winehq with our master branch?

Hi Slice

 

Switch branch from your local repo from develop to master

Then follow the tips I add in this first topics page...

 

Or you can also download again the entire repo in a different location and update the local master

Then push the synced commit to our private repo

 

ErmaC

Link to comment
Share on other sites
Slice
Slice
Posted
Posted 
Sergeys-iMac:Wine-Sherry slice$ git branch

* develop

  master

Sergeys-iMac:Wine-Sherry slice$ git checkout master

error: Your local changes to the following files would be overwritten by checkout:

	.DS_Store

	.gitignore

	Makefile

	config.log

	config.status

	configure.ac.orig

	dlls/msvcirt/Makefile

	dlls/msvcirt/msvcirt.dll.so

	dlls/msvcirt/msvcirt.o

	dlls/msvcirt/tests/Makefile

	dlls/msvcirt/tests/msvcirt.o

	dlls/msvcirt/tests/msvcirt_test-stripped.exe.so

	dlls/msvcirt/tests/msvcirt_test.exe.so

	dlls/wined3d/Makefile

Please, commit your changes or stash them before you can switch branches.

Aborting

Sergeys-iMac:Wine-Sherry slice$ git branch

* develop

  master

Sergeys-iMac:Wine-Sherry slice$

Why these files here and why only they?
Link to comment
Share on other sites
Slice
Slice
Posted
Posted

And why version is still 1.7.44 while I apply patch for 1.7.45?

Sergeys-iMac:Wine-Sherry slice$ git describe head
wine-1.7.44-226-g6a95b2e
Sergeys-iMac:Wine-Sherry slice$
Link to comment
Share on other sites
  • 7 months later...
 Share
Go to topic listing
×
×
  • Create New...