[BUILD] Update SOVERSION and REVISION.

diff --git a/source/000_gitlog.txt b/source/000_gitlog.txt
index 56b1579..a942883 100644 (file)
--- a/source/000_gitlog.txt
+++ b/source/000_gitlog.txt
@@ -1,3 +1,99 @@
+commit f72d448db12b6daa0866b08f50a755372adc1076
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sun Feb 25 14:30:52 2018 +0900
+
+    [VM][MC6809] Fix halt sequence.
+
+commit afd8d1b43f13175c38df78431e18e61d6adafa4e
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sun Feb 25 14:29:59 2018 +0900
+
+    [VM][FM7][FM77AV][MAINMEM] Fix (adjust) memory-wait-parameters.Fixed FM77AV's demonstration and LUXOL.
+
+commit b6da1c04df2f6bb15d2aa643cadd3f3c8dd8bc27
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sun Feb 25 05:56:28 2018 +0900
+
+    [OSD][Qt[Screen] Expect to fix lock up when openning debugger.
+
+commit 02295c83ee50fbfd39e08dc9256672b2d7c45c11
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sun Feb 25 05:56:05 2018 +0900
+
+    [VM][FM7] Re-implement around clock.
+
+commit 90cd6b3eca4e94c83a78e12255a3292dac9c04af
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sun Feb 25 05:54:19 2018 +0900
+
+    [VM][MB8877] Revert modify of seek command ; when track register != physical track.
+
+commit 78543975b9aca5cced255f10b1b348eba119081d
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sun Feb 25 05:52:20 2018 +0900
+
+    [VM][FM7][MAINMEM] Implement memory wait.EVENT:: cannot modify first CPU after regist.
+
+commit 48fae30f7eccc503f764c53bbc82ff780c53c987
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sun Feb 25 05:50:44 2018 +0900
+
+    [VM][MC6809] Fix arount extra_iclock.Maybe fix around accessing wait.
+
+commit 126a160bb7279ec8de3d7ddaa2c8c25b274d87f7
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sat Feb 24 03:13:46 2018 +0900
+
+    [DOC] Update credits.
+
+commit 4f52efd187312841d4de98b3831a9468bfd78a09
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sat Feb 24 03:11:22 2018 +0900
+
+    [DOC][TOOL] Update (some) binaries under tool/ and some documents.
+
+commit f401b5435c8979bb49ef67f87ff92d4a3b1a6f89
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sat Feb 24 03:06:01 2018 +0900
+
+    [BUILD][DOC] Merge upstream 2018-02-23.
+
+commit 5804e7422a57a5aa1d596c2e51556cae8f88767d
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sat Feb 24 03:04:27 2018 +0900
+
+    [VM] Merge Upstream 2018-02-23.
+
+commit 7b1c8f2b85e41cbfa8bb08813bd8011cba372007
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Sat Feb 24 01:20:59 2018 +0900
+
+    [VM][MB8877] SEEK COMMAND: Fix seek target what difference betweeen track register and physical drive.Thank to Haserin.
+
+commit 1264c25394aa909d23bdcad50df4b0ac21d620b4
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Fri Feb 23 22:29:46 2018 +0900
+
+    [Qt][OpenGL][MOVIE_LOADER] Use QMutexLocker if ready to use.
+
+commit ad6bba3d2126862a3be3985853f7bca1936efd7c
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Fri Feb 23 22:29:12 2018 +0900
+
+    [OSD][Qt] Use Recursive-Mutex instead of Semaphore.
+
+commit 894e4288802e0d92253c1d41a41cadeadcf9391e
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Fri Feb 23 22:27:50 2018 +0900
+
+    [VM][MB8877] Fix wait value when end of seek and verify.Thanks to Ryu Takegami.
+
+commit dd04a1baf684626b840470074975978a6255d1be
+Author: K.Ohta <whatisthis.sowhat@gmail.com>
+Date:   Thu Feb 22 23:40:52 2018 +0900
+
+    [DOC] Update README_20180222.txt.
+
 commit b860cb162ccab2fb3ffcd8f930d2770b7fc65426
 Author: K.Ohta <whatisthis.sowhat@gmail.com>
 Date:   Thu Feb 22 22:00:59 2018 +0900

diff --git a/source/revision.txt b/source/revision.txt
index 697dc9e..fc3cf29 100644 (file)
--- a/source/revision.txt
+++ b/source/revision.txt
@@ -1,3 +1,3 @@
 <B><FONT SIZE=-1>Upstream 2018-02-23<BR>
-Qt Port and FM7 series 2018-02-24 FDC TEST2<BR>
+Qt Port and FM7 series 2018-02-25 FDC TEST2<BR>
 </FONT></B>

diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt
index 5f6ea58..fe2a527 100644 (file)
--- a/source/src/qt/CMakeLists.txt
+++ b/source/src/qt/CMakeLists.txt
@@ -1,5 +1,5 @@
 message("* qt/osd")
-SET(THIS_LIB_VERSION 2.10.1) 
+SET(THIS_LIB_VERSION 2.10.2) 
 
 set(s_qt_osd_headers
        osd_base.h

diff --git a/source/src/qt/avio/CMakeLists.txt b/source/src/qt/avio/CMakeLists.txt
index 02f5677..3616b28 100644 (file)
--- a/source/src/qt/avio/CMakeLists.txt
+++ b/source/src/qt/avio/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* qt/avio")
 
-SET(THIS_LIB_VERSION 2.7.0)
+SET(THIS_LIB_VERSION 2.7.1)
 set(s_qt_avio_headers
          movie_saver.h
          movie_loader.h

diff --git a/source/src/qt/emuutils/CMakeLists.txt b/source/src/qt/emuutils/CMakeLists.txt
index a1f452b..8f6c46e 100644 (file)
--- a/source/src/qt/emuutils/CMakeLists.txt
+++ b/source/src/qt/emuutils/CMakeLists.txt
@@ -7,7 +7,7 @@ set(s_qt_emuutils_srcs
          ../../fileio.cpp
          )
        
-SET(THIS_LIB_VERSION 2.7.0) 
+SET(THIS_LIB_VERSION 2.7.1) 
 
 if(WIN32)
 include (GenerateExportHeader)

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index 420a841..11da623 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* qt/gui")
 
-set(THIS_LIB_VERSION 2.11.2)
+set(THIS_LIB_VERSION 2.11.3)
 set(s_qt_gui_headers
          csp_logger.h
   

diff --git a/source/src/res/credits.html b/source/src/res/credits.html
index b935367..7604d85 100644 (file)
--- a/source/src/res/credits.html
+++ b/source/src/res/credits.html
@@ -9,15 +9,15 @@
 <h1>Common Source Code Project</h1>
 <DIV ALIGN=RIGHT><FONT SIZE=2>
 Upstream Version: 2018-02-23<BR>
-Qt Port and FM7 series 2018-02-24 FDC TEST2<BR>
-libCSPavio 2.7.0<BR>
-libCSPgui 2.11.2<BR>
-libCSPosd 2.10.1<BR>
-libCSPemu_utils 2.7.0<BR>
-libCSPcommon_vm 1.1.27<BR>
-libCSPfmgen 1.1.2<BR>
+Qt Port and FM7 series 2018-02-25 FDC TEST2<BR>
+libCSPavio 2.7.1<BR>
+libCSPgui 2.11.3<BR>
+libCSPosd 2.10.2<BR>
+libCSPemu_utils 2.7.1<BR>
+libCSPcommon_vm 1.1.28<BR>
+libCSPfmgen 1.1.3<BR>
 FFMPEG 3.4 + liblame 3.99 + libx264-152<BR>
-Build Version: fa07e353db77a757c8f8d33c296ec6a51cf14220<BR>
+Build Version: <BR>
 </FONT></DIV>
 <BR>
 <DIV ALIGN=RIGHT><FONT SIZE=3>

diff --git a/source/src/vm/common_vm/CMakeLists.txt b/source/src/vm/common_vm/CMakeLists.txt
index be8080f..01656cf 100644 (file)
--- a/source/src/vm/common_vm/CMakeLists.txt
+++ b/source/src/vm/common_vm/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* vm/common_vm")
 
-SET(THIS_LIB_VERSION 1.1.27)
+SET(THIS_LIB_VERSION 1.1.28)
 set(s_vm_common_vm_srcs
        ../315-5124.cpp
        ../am9511.cpp

diff --git a/source/src/vm/fmgen/CMakeLists.txt b/source/src/vm/fmgen/CMakeLists.txt
index cea6acd..feba0a3 100644 (file)
--- a/source/src/vm/fmgen/CMakeLists.txt
+++ b/source/src/vm/fmgen/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 
 message("* vm/fmgen")
+SET(THIS_LIB_VERSION 1.1.3)
 
 SET(s_vm_fmgen_srcs
        fmgen.cpp
@@ -24,8 +25,8 @@ target_link_libraries(CSPfmgen
        ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a
        )
 set_target_properties(CSPfmgen PROPERTIES
-                            SOVERSION 1.1.2
-                            VERSION 1.1.2
+                            SOVERSION ${THIS_LIB_VERSION}
+                            VERSION ${THIS_LIB_VERSION}
                             LINK_INTERFACE_LIBRARIES ""
                             )
 generate_export_header(CSPfmgen
@@ -37,17 +38,17 @@ generate_export_header(CSPfmgen
 
 else()
   if(USE_DEVICES_SHARED_LIB)
-       add_library(CSPfmgen SHARED
-      ${s_vm_fmgen_srcs}
-         )
-       set_target_properties(CSPfmgen PROPERTIES 
-      SOVERSION 1.1.2
-      VERSION 1.1.2
-         )
-       INSTALL(TARGETS CSPfmgen DESTINATION ${LIBCSP_INSTALL_DIR})
+      add_library(CSPfmgen SHARED
+                 ${s_vm_fmgen_srcs}
+                )
+      set_target_properties(CSPfmgen PROPERTIES 
+                        SOVERSION ${THIS_LIB_VERSION}
+                       VERSION ${THIS_LIB_VERSION}
+                       )
+      INSTALL(TARGETS CSPfmgen DESTINATION ${LIBCSP_INSTALL_DIR})
   else()
-       add_library(fmgen STATIC
-      ${s_vm_fmgen_srcs}
-         )
+      add_library(fmgen STATIC
+                  ${s_vm_fmgen_srcs}
+                 )
   endif()
 endif()

diff --git a/source/tool/installer_unix.sh b/source/tool/installer_unix.sh
index 971e735..8c1544a 100755 (executable)
--- a/source/tool/installer_unix.sh
+++ b/source/tool/installer_unix.sh
@@ -7,7 +7,7 @@ LDCONFIG=/sbin/ldconfig
 CSP_ARCH="x86_64-linux-gnu"
 MULTIARCH="Yes"
 CSP_PREFIX=/usr/local
-CSP_GUILIB="libCSPgui.so.2.11.2 libCSPosd.so.2.10.1 libCSPemu_utils.so.2.7.0 libCSPavio.2.7.0 libCSPfmgen.so.1.1.2 libCSPcommon_vm.so.1.1.27"
+CSP_GUILIB="libCSPgui.so.2.11.3 libCSPosd.so.2.10.2 libCSPemu_utils.so.2.7.1 libCSPavio.2.7.1 libCSPfmgen.so.1.1.3 libCSPcommon_vm.so.1.1.28"
 
 for i in "$@"; do
   case "$1" in