On Tuesday, December 30, 2014, jan i <[email protected]> wrote: > Hi Peter > > Seems your commit, destroyed some of the files I had made like NamesTest.c > and OStest.c >
think I got it covered, at least my branch can merge with master again. you deleted namestest.c with an explanation, and it seems ostest.c was not added, my fault, due to a git problem I have......earlier removed non-committed files when I changed branch. can we agree that updates to stable is done with --squash so it is not a repeat of master but a line of points in time where our project was stable. I would like to be able to checkout any commit in stable and know its a stable version. happy new year to everybody rgds jan i Did you forget a "git pull" or something ? > > I can also see all my commits in your commits, so I am kind of wondering > what happened. > > rgds > jan I. > > > On 30 December 2014 at 15:45, <[email protected] > <javascript:_e(%7B%7D,'cvml','[email protected]');>> wrote: > >> Don't store bin/lib/include dirs in repository >> >> These are only intended to contain relevant files from the downloaded >> binary distributions, and excluding them from the repository makes it >> simpler to blow them away and replace them with those created by the >> script when necessary. >> >> The unistd.h file that was present in the include does not necessary, >> because it was only the for zconf.h, but zconf.h does not attempt to >> include unistd.h if HAVE_UNISTD_H is not set, as is the case on Windows. >> >> >> Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo >> Commit: >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/74030263 >> Tree: >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/74030263 >> Diff: >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/74030263 >> >> Branch: refs/heads/stable >> Commit: 74030263b8ae49406824ce1b6a8394e2d20e538e >> Parents: a480e75 >> Author: Peter Kelly <[email protected] >> <javascript:_e(%7B%7D,'cvml','[email protected]');>> >> Authored: Tue Dec 30 21:30:22 2014 +0700 >> Committer: Peter Kelly <[email protected] >> <javascript:_e(%7B%7D,'cvml','[email protected]');>> >> Committed: Tue Dec 30 21:37:57 2014 +0700 >> >> ---------------------------------------------------------------------- >> external/README.txt | 147 ++++++++++++++++++++++++++++++++++++- >> external/bin/README.txt | 2 - >> external/extract_downloads.sh | 6 ++ >> external/include/README.txt | 81 -------------------- >> external/include/unistd.h | 3 - >> external/lib/README.txt | 10 --- >> 6 files changed, 152 insertions(+), 97 deletions(-) >> ---------------------------------------------------------------------- >> >> >> >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/README.txt >> ---------------------------------------------------------------------- >> diff --git a/external/README.txt b/external/README.txt >> index 4bf4836..5067bdc 100644 >> --- a/external/README.txt >> +++ b/external/README.txt >> @@ -20,4 +20,149 @@ SDL2_image developer files: >> We are working on reducing these dependencies. >> >> On a Unix system (and possibly under cygwin), you can run the >> -fetch_downloads.sh script to download these. >> +fetch_downloads.sh script to download these. The extract_downloads.sh >> +script places all the files in the bin, lib, and include >> +directories. The result should look like this the listing below. >> + >> +After building Corinthia, you will need to copy all of the DLL files from >> +external/bin into the bin directory within your build directory, >> +alongside dfconvert and dftest. >> + >> +bin/SDL2.dll >> +bin/SDL2_image.dll >> +bin/iconv.dll >> +bin/iconv.exe >> +bin/libjpeg-9.dll >> +bin/libpng16-16.dll >> +bin/libtiff-5.dll >> +bin/libwebp-4.dll >> +bin/libxml2.dll >> +bin/xmlcatalog.exe >> +bin/xmllint.exe >> +bin/zlib1.dll >> +include/SDL.h >> +include/SDL_assert.h >> +include/SDL_atomic.h >> +include/SDL_audio.h >> +include/SDL_bits.h >> +include/SDL_blendmode.h >> +include/SDL_clipboard.h >> +include/SDL_config.h >> +include/SDL_cpuinfo.h >> +include/SDL_endian.h >> +include/SDL_error.h >> +include/SDL_events.h >> +include/SDL_filesystem.h >> +include/SDL_gamecontroller.h >> +include/SDL_gesture.h >> +include/SDL_haptic.h >> +include/SDL_hints.h >> +include/SDL_image.h >> +include/SDL_joystick.h >> +include/SDL_keyboard.h >> +include/SDL_keycode.h >> +include/SDL_loadso.h >> +include/SDL_log.h >> +include/SDL_main.h >> +include/SDL_messagebox.h >> +include/SDL_mouse.h >> +include/SDL_mutex.h >> +include/SDL_name.h >> +include/SDL_opengl.h >> +include/SDL_opengles.h >> +include/SDL_opengles2.h >> +include/SDL_pixels.h >> +include/SDL_platform.h >> +include/SDL_power.h >> +include/SDL_quit.h >> +include/SDL_rect.h >> +include/SDL_render.h >> +include/SDL_revision.h >> +include/SDL_rwops.h >> +include/SDL_scancode.h >> +include/SDL_shape.h >> +include/SDL_stdinc.h >> +include/SDL_surface.h >> +include/SDL_system.h >> +include/SDL_syswm.h >> +include/SDL_test.h >> +include/SDL_test_assert.h >> +include/SDL_test_common.h >> +include/SDL_test_compare.h >> +include/SDL_test_crc32.h >> +include/SDL_test_font.h >> +include/SDL_test_fuzzer.h >> +include/SDL_test_harness.h >> +include/SDL_test_images.h >> +include/SDL_test_log.h >> +include/SDL_test_md5.h >> +include/SDL_test_random.h >> +include/SDL_thread.h >> +include/SDL_timer.h >> +include/SDL_touch.h >> +include/SDL_types.h >> +include/SDL_version.h >> +include/SDL_video.h >> +include/begin_code.h >> +include/close_code.h >> +include/iconv.h >> +include/libxml/DOCBparser.h >> +include/libxml/HTMLparser.h >> +include/libxml/HTMLtree.h >> +include/libxml/SAX.h >> +include/libxml/SAX2.h >> +include/libxml/c14n.h >> +include/libxml/catalog.h >> +include/libxml/chvalid.h >> +include/libxml/debugXML.h >> +include/libxml/dict.h >> +include/libxml/encoding.h >> +include/libxml/entities.h >> +include/libxml/globals.h >> +include/libxml/hash.h >> +include/libxml/list.h >> +include/libxml/nanoftp.h >> +include/libxml/nanohttp.h >> +include/libxml/parser.h >> +include/libxml/parserInternals.h >> +include/libxml/pattern.h >> +include/libxml/relaxng.h >> +include/libxml/schemasInternals.h >> +include/libxml/schematron.h >> +include/libxml/threads.h >> +include/libxml/tree.h >> +include/libxml/uri.h >> +include/libxml/valid.h >> +include/libxml/xinclude.h >> +include/libxml/xlink.h >> +include/libxml/xmlIO.h >> +include/libxml/xmlautomata.h >> +include/libxml/xmlerror.h >> +include/libxml/xmlexports.h >> +include/libxml/xmlmemory.h >> +include/libxml/xmlmodule.h >> +include/libxml/xmlreader.h >> +include/libxml/xmlregexp.h >> +include/libxml/xmlsave.h >> +include/libxml/xmlschemas.h >> +include/libxml/xmlschemastypes.h >> +include/libxml/xmlstring.h >> +include/libxml/xmlunicode.h >> +include/libxml/xmlversion.h >> +include/libxml/xmlwriter.h >> +include/libxml/xpath.h >> +include/libxml/xpathInternals.h >> +include/libxml/xpointer.h >> +include/zconf.h >> +include/zlib.h >> +lib/SDL2.lib >> +lib/SDL2_image.lib >> +lib/SDL2main.lib >> +lib/SDL2test.lib >> +lib/iconv.lib >> +lib/iconv_a.lib >> +lib/libxml2.lib >> +lib/libxml2_a.lib >> +lib/libxml2_a_dll.lib >> +lib/zdll.lib >> +lib/zlib.def >> >> >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/bin/README.txt >> ---------------------------------------------------------------------- >> diff --git a/external/bin/README.txt b/external/bin/README.txt >> deleted file mode 100644 >> index 8b69606..0000000 >> --- a/external/bin/README.txt >> +++ /dev/null >> @@ -1,2 +0,0 @@ >> -Put the downloaded external DLL files here. >> - >> >> >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/extract_downloads.sh >> ---------------------------------------------------------------------- >> diff --git a/external/extract_downloads.sh b/external/extract_downloads.sh >> index cbfbd5f..0d151e3 100755 >> --- a/external/extract_downloads.sh >> +++ b/external/extract_downloads.sh >> @@ -17,6 +17,12 @@ mkdir packages/zlib >> (cd packages/zlib && unzip ../../download/zlib128-dll.zip) >> chmod -R u+w packages/zlib >> >> +for i in bin lib include; do >> + if [ ! -d $i ]; then >> + mkdir $i >> + fi >> +done >> + >> mv packages/SDL2/SDL2-2.0.3/include/* include >> mv packages/SDL2/SDL2-2.0.3/lib/x86/*.lib lib >> mv packages/SDL2/SDL2-2.0.3/lib/x86/*.dll bin >> >> >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/include/README.txt >> ---------------------------------------------------------------------- >> diff --git a/external/include/README.txt b/external/include/README.txt >> deleted file mode 100644 >> index 83b370f..0000000 >> --- a/external/include/README.txt >> +++ /dev/null >> @@ -1,81 +0,0 @@ >> -put the downloaded external header files here. >> - >> -The content should be: >> - zlib.h >> - zconf.h >> - >> - SDL.h >> - SDL_main.h >> - SDL_image.h >> - SDL_stdinc.h >> - SDL_config.h >> - SDL_platform.h >> - SDL_assert.h >> - SDL_atomic.h >> - SDL_audio.h >> - SDL_error.h >> - SDL_endian.h >> - SDL_mutex.h >> - SDL_thread.h >> - SDL_rwops.h >> - SDL_clipboard.h >> - SDL_cpuinfo.h >> - SDL_events.h >> - SDL_video.h >> - SDL_pixels.h >> - SDL_rect.h >> - SDL_surface.h >> - SDL_blendmode.h >> - SDL_keyboard.h >> - SDL_mouse.h >> - SDL_joystick.h >> - SDL_gamecontroller.h >> - SDL_quit.h >> - SDL_gesture.h >> - SDL_touch.h >> - SDL_keycode.h >> - SDL_scancode.h >> - SDL_filesystem.h >> - SDL_haptic.h >> - SDL_hints.h >> - SDL_loadso.h >> - SDL_log.h >> - SDL_messagebox.h >> - SDL_power.h >> - SDL_render.h >> - SDL_system.h >> - SDL_timer.h >> - SDL_version.h >> - begin_code.h >> - close_code.h >> - >> - libxml/tree.h >> - libxml/xmlwriter.h >> - libxml/xmlversion.h >> - libxml/xmlexports.h >> - libxml/xmlstring.h >> - libxml/xmlregexp.h >> - libxml/dict.h >> - libxml/xmlmemory.h >> - libxml/thread.h >> - libxml/globals.h >> - libxml/parser.h >> - libxml/hash.h >> - libxml/valid.h >> - libxml/xmlerror.h >> - libxml/list.h >> - libxml/xmlautomata.h >> - libxml/entities.h >> - libxml/encoding.h >> - libxml/xmlIO.h >> - libxml/SAX.h >> - libxml/SAX2.h >> - libxml/xlink.h >> - >> - iconv.h >> - >> - >> - >> - >> - >> - >> >> >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/include/unistd.h >> ---------------------------------------------------------------------- >> diff --git a/external/include/unistd.h b/external/include/unistd.h >> deleted file mode 100644 >> index 5f82577..0000000 >> --- a/external/include/unistd.h >> +++ /dev/null >> @@ -1,3 +0,0 @@ >> -/** >> - Dummy file to satisfy zconf.h includes >> - **/ >> >> >> http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/74030263/external/lib/README.txt >> ---------------------------------------------------------------------- >> diff --git a/external/lib/README.txt b/external/lib/README.txt >> deleted file mode 100644 >> index d20f6ad..0000000 >> --- a/external/lib/README.txt >> +++ /dev/null >> @@ -1,10 +0,0 @@ >> -Put the downloaded external libraries here. >> - >> -The content should be: >> - libxml2.lib >> - zlib.h >> - libiconv.lib >> - SDL2.lib >> - SDL2_image.lib >> - >> - >> >> > -- Sent from My iPad, sorry for any misspellings.
