add autodeploy

.travis.yml

@@ -1,15 +1,54 @@
 language: cpp
-os:
-  - linux
-  - osx
+
 branches:
   only:
     - master
-compiler:
-  - gcc
-  - clang
+    - /^golded-.*/
+matrix:
+  include:
+    - os: linux
+      env:
+        - MATRIX_EVAL="CC=clang CXX=clang++"
+          ARCH="x86_64"
+    - os: linux
+      env:
+        - MATRIX_EVAL="CC='clang -m32' CXX='clang++ -m32'"
+          CF="-DCMAKE_LIBRARY_PATH=/usr/lib32"
+          ARCH="i686"
+          PACKAGES="gcc-multilib g++-multilib lib32ncurses5-dev"
+    - os: osx
+      env:
+        - MATRIX_EVAL="CC=clang CXX=clang++"
+          ARCH="x86_64"
 before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y rpm; fi
+  - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends
+    --no-upgrade -qq $PACKAGES; fi
   - cp golded3/mygolded.__h golded3/mygolded.h
 script:
-  - if [[ "$CXX" == "g++" ]]; then CPPFLAGS="-Wno-write-strings -Wno-unused-result" make; fi
-  - if [[ "$CXX" == "clang++" ]]; then CPPFLAGS="-Wno-keyword-macro -Wno-c++11-compat-deprecated-writable-strings" make; fi
+  - eval "${MATRIX_EVAL}"
+  - mkdir build
+  - cd build
+  - cmake .. ${CF} -DCPACK_DEBIAN_PACKAGE_MAINTAINER=travis-ci
+  - cmake --build .
+  - cpack
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpack -G RPM; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpack -G DEB; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then for file in *.rpm; do mv $file
+    $(basename $file .rpm).${ARCH}.rpm; done; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then for file in *.deb; do mv $file
+    $(basename $file .deb).${ARCH}.deb; done; fi
+  - for file in *.tar.gz; do mv $file $(basename $file .tar.gz).${ARCH}.tar.gz;
+    done
+deploy:
+  provider: releases
+  api_key: $GITHUB_OAUTH_TOKEN
+  file_glob: true
+  skip_cleanup: true
+  file:
+    - $TRAVIS_BUILD_DIR/build/*.rpm
+    - $TRAVIS_BUILD_DIR/build/*.deb
+    - $TRAVIS_BUILD_DIR/build/*.tar.gz
+  on:
+    tags: true
+    branch: master

CMakeLists.txt

@@ -0,0 +1,62 @@
+cmake_minimum_required(VERSION 2.8.11)
+project(golded-plus C CXX)
+
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+
+check_function_exists(snprintf HAVE_SNPRINTF)
+if (${HAVE_SNPRINTF})
+  add_definitions(-DHAVE_SNPRINTF=1)
+endif()
+check_function_exists(vsnprintf HAVE_VSNPRINTF)
+if (${HAVE_VSNPRINTF})
+  add_definitions(-DHAVE_VSNPRINTF=1)
+endif()
+CHECK_INCLUDE_FILE("stdarg.h" HAVE_STDARG_H)
+if (${HAVE_STDARG_H})
+  add_definitions(-DHAVE_STDARG_H=1)
+endif()
+include(FindCurses)
+if (CURSES_NCURSES_LIBRARY)
+  add_definitions(-D__USE_NCURSES__)
+endif()
+
+if (MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /J")
+  add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -D_CRT_SECURE_NO_WARNINGS -D_ALLOW_RTCc_IN_STL  -D_CONSOLE -DHAVE_CONFIG_H -D__INCLUDE_NEW_KEYWORDS__)
+else()
+  add_definitions(-funsigned-char -D__INCLUDE_NEW_KEYWORDS__ -DPRAGMA_PACK -Wno-sign-compare -pedantic -Wno-write-strings)
+endif()
+
+add_subdirectory(goldlib)
+add_subdirectory(golded3)
+add_subdirectory(goldnode)
+add_subdirectory(rddt)
+
+set (CPACK_STRIP_FILES TRUE)
+
+include(GNUInstallDirs)
+install(FILES
+  docs/copying
+  docs/copying.lib
+  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+)
+install(FILES
+  docs/golded.1
+  docs/goldnode.1
+  docs/rddt.1
+  DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
+)
+install(DIRECTORY cfgs DESTINATION ${CMAKE_INSTALL_DOCDIR})
+if (MSVC)
+  set(CPACK_GENERATOR ${CPACK_GENERATOR} 7Z)
+else()
+  set(CPACK_GENERATOR ${CPACK_GENERATOR} TGZ)
+endif()
+
+set (CPACK_PACKAGE_VERSION_MAJOR "1")
+set (CPACK_PACKAGE_VERSION_MINOR "1")
+file(READ srcdate.h CPACK_PACKAGE_VERSION_PATCH LIMIT 8 OFFSET 41)
+string(SUBSTRING ${CPACK_PACKAGE_VERSION_PATCH} 0 8 CPACK_PACKAGE_VERSION_PATCH)
+set(CPACK_PACKAGE_VERSION_PATCH "5-${CPACK_PACKAGE_VERSION_PATCH}")
+INCLUDE(CPack)

appveyor.yml

@@ -2,13 +2,28 @@ version: '{build}'
 branches:
   only:
     - master
+    - /^golded-.*/
 image:
   - Visual Studio 2017
-platform:
-  - Win32
-  - x64
+environment:
+   matrix:
+    - generator: Visual Studio 15 2017
+    - generator: Visual Studio 15 2017 Win64
 install:
   - cmd: copy golded3\mygolded.__h golded3\mygolded.h
-build:
-  parallel: true
-  project: golded.vs2017.sln
+build_script:
+  - cmd: mkdir build && cd build && cmake --version
+  - cmd: cmake .. -G "%GENERATOR%" 
+  - cmd: cmake --build . -- /P:Configuration=Release
+  - cmd: cpack
+
+artifacts:
+  - path: build\*.7z
+    name: dist
+
+deploy:                                                                                                                                                                                                      
+  provider: GitHub                                                                                                                                                                                           
+  artifact: dist                                                                                                                                                                                             
+  auth_token: $(GITHUB_OAUTH_TOKEN)                                                                                                                                                                          
+  on:                                                                                                                                                                                                        
+    appveyor_repo_tag: true

golded3/CMakeLists.txt

@@ -0,0 +1,73 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(golded_SOURCES
+  gcalst.cpp
+  gcarea.cpp
+  gccfgg.cpp
+  gccfgg0.cpp
+  gccfgg1.cpp
+  gccfgg2.cpp
+  gccfgg3.cpp
+  gccfgg4.cpp
+  gccfgg5.cpp
+  gccfgg6.cpp
+  gccfgg7.cpp
+  gccfgg8.cpp
+  gckeys.cpp
+  gclang.cpp
+  gcmisc.cpp
+  gealst.cpp
+  gearea.cpp
+  gecarb.cpp
+  gecmfd.cpp
+  gectnr.cpp
+  gectrl.cpp
+  gedoit.cpp
+  gedoss.cpp
+  geedit.cpp
+  geedit2.cpp
+  geedit3.cpp
+  gefile.cpp
+  gefind.cpp
+  geglob.cpp
+  gehdre.cpp
+  geinit.cpp
+  geline.cpp
+  gelmsg.cpp
+  gemain.cpp
+  gemenu.cpp
+  gemlst.cpp
+  gemnus.cpp
+  gemrks.cpp
+  gemsgs.cpp
+  genode.cpp
+  geplay.cpp
+  gepost.cpp
+  geqwks.cpp
+  gerand.cpp
+  geread.cpp
+  geread2.cpp
+  gescan.cpp
+  gesrch.cpp
+  gesoup.cpp
+  getpls.cpp
+  geusrbse.cpp
+  geutil.cpp
+  geutil2.cpp
+  geview.cpp
+  gmarea.cpp
+  gehtml.cpp
+  golded3.cpp
+)
+include_directories(../goldlib/gall ../goldlib/gcui ../goldlib/gmb3 ../goldlib/gcfg ../goldlib/smblib ../goldlib/uulib ../goldlib/glibc)
+add_executable(golded ${golded_SOURCES})
+target_link_libraries(golded gmb3 gcfg  uulib gall  gcui smblib hunspell)
+if (MSVC)
+  target_link_libraries(golded glibc winmm.lib)
+endif()
+if (CURSES_NCURSES_LIBRARY)
+  target_link_libraries(golded ${CURSES_NCURSES_LIBRARY})
+endif()
+
+INSTALL(TARGETS golded
+  RUNTIME DESTINATION bin
+)

goldlib/CMakeLists.txt

@@ -0,0 +1,10 @@
+add_subdirectory(hunspell)
+add_subdirectory(gall)
+add_subdirectory(gcfg)
+add_subdirectory(gcui)
+add_subdirectory(smblib)
+add_subdirectory(gmb3)
+add_subdirectory(uulib)
+if (MSVC)
+  add_subdirectory(glibc)
+endif()

goldlib/gall/CMakeLists.txt

@@ -0,0 +1,81 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(gall_SOURCES
+  gbmh.cpp
+  gcharset.cpp
+  gcrc16tb.cpp
+  gcrc32tb.cpp
+  gcrchash.cpp
+  gcrckeyv.cpp
+  gcrcm16.cpp
+  gcrcm32.cpp
+  gcrcs16.cpp
+  gcrcs32.cpp
+  gdbgerr.cpp
+  gdbgexit.cpp
+  gdbgtrk.cpp
+  gdirposx.cpp
+  gespell.cpp
+  geval.cpp
+  gevalhum.cpp
+  gevalrpn.cpp
+  gfile.cpp
+  gfilport.cpp
+  gfilutl1.cpp
+  gfilutl2.cpp
+  gftnaddr.cpp
+  gftnnl.cpp
+  gftnnlfd.cpp
+  gftnnlfu.cpp
+  gftnnlge.cpp
+  gftnnlv7.cpp
+  gfuzzy.cpp
+  ghdrmime.cpp
+  glog.cpp
+  gmemdbg.cpp
+  gmemutil.cpp
+  gmsgattr.cpp
+  gprnutil.cpp
+  gregex.cpp
+  gsearch.cpp
+  gsnd.cpp
+  gsndwrap.cpp
+  gstrbags.cpp
+  gstrctyp.cpp
+  gstrmail.cpp
+  gstrname.cpp
+  gstrutil.cpp
+  gtimjuld.cpp
+  gtimutil.cpp
+  gtxtpara.cpp
+  gusrbase.cpp
+  gusrezyc.cpp
+  gusrgold.cpp
+  gusrhuds.cpp
+  gusrmax.cpp
+  gusrpcb.cpp
+  gusrra2.cpp
+  gusrxbbs.cpp
+  gutlclip.cpp
+  gutlcode.cpp
+  gutlgrp.cpp
+  gutlmisc.cpp
+  gutlmtsk.cpp
+  gutltag.cpp
+  gutlvers.cpp
+  gwildmat.cpp
+)
+if (UNIX)
+  list(APPEND gall_SOURCES
+    gkbdunix.cpp
+    gsigunix.cpp
+    gutlunix.cpp
+  )
+elseif (MSVC)
+  list(APPEND gall_SOURCES
+    gutlwin.cpp
+    gutlwinm.cpp
+  )
+endif()
+ADD_LIBRARY(gall STATIC ${gall_SOURCES})
+include_directories(.. ../glibc)
+target_link_libraries(gall hunspell)

goldlib/gcfg/CMakeLists.txt

@@ -0,0 +1,49 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(gcfg_SOURCES
+  gedacfg.cpp
+  gxareas.cpp
+  gxcrash.cpp
+  gxdb.cpp
+  gxdutch.cpp
+  gxezy102.cpp
+  gxezy110.cpp
+  gxfd.cpp
+  gxfecho4.cpp
+  gxfecho5.cpp
+  gxfecho6.cpp
+  gxfidpcb.cpp
+  gxfm092.cpp
+  gxfm100.cpp
+  gxfm116.cpp
+  gxgecho.cpp
+  gxhpt.cpp
+  gximail4.cpp
+  gximail5.cpp
+  gximail6.cpp
+  gxinter.cpp
+  gxlora.cpp
+  gxmax3.cpp
+  gxme2.cpp
+  gxopus.cpp
+  gxpcb.cpp
+  gxportal.cpp
+  gxprobrd.cpp
+  gxqfront.cpp
+  gxqecho.cpp
+  gxquick.cpp
+  gxra.cpp
+  gxraecho.cpp
+  gxspace.cpp
+  gxsquish.cpp
+  gxsuper.cpp
+  gxsync.cpp
+  gxtimed.cpp
+  gxtmail.cpp
+  gxts.cpp
+  gxwmail.cpp
+  gxwtr.cpp
+  gxxbbs.cpp
+  gxxmail.cpp
+)
+include_directories(../gall ../glibc)
+ADD_LIBRARY(gcfg STATIC ${gcfg_SOURCES})

goldlib/gcui/CMakeLists.txt

@@ -0,0 +1,24 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(gcui_SOURCES
+  gkbdbase.cpp
+  gkbdgetm.cpp
+  gkbdwait.cpp
+  gsrchmgr.cpp
+  gmoubase.cpp
+  gvidbase.cpp
+  gvidinit.cpp
+  gwinbase.cpp
+  gwindow.cpp
+  gwinhlp1.cpp
+  gwinhlp2.cpp
+  gwininit.cpp
+  gwinline.cpp
+  gwinmenu.cpp
+  gwinmnub.cpp
+  gwinpckf.cpp
+  gwinpcks.cpp
+  gwinpick.cpp
+  gwinput2.cpp
+)
+include_directories("../gall")
+ADD_LIBRARY(gcui STATIC ${gcui_SOURCES})

goldlib/glibc/CMakeLists.txt

@@ -0,0 +1,7 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(glibc_SOURCES
+  regex.cpp
+)
+add_definitions(-DHAVE_CONFIG_H)
+include_directories(../gall)
+ADD_LIBRARY(glibc STATIC ${glibc_SOURCES})

goldlib/gmb3/CMakeLists.txt

@@ -0,0 +1,44 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(gmb3_SOURCES
+  gmoarea.cpp
+  gmohuds.cpp
+  gmoezyc1.cpp
+  gmoezyc2.cpp
+  gmoezyc3.cpp
+  gmoezyc4.cpp
+  gmoezyc5.cpp
+  gmofido1.cpp
+  gmofido2.cpp
+  gmofido3.cpp
+  gmofido4.cpp
+  gmofido5.cpp
+  gmojamm1.cpp
+  gmojamm2.cpp
+  gmojamm3.cpp
+  gmojamm4.cpp
+  gmojamm5.cpp
+  gmopcbd1.cpp
+  gmopcbd2.cpp
+  gmopcbd3.cpp
+  gmopcbd4.cpp
+  gmopcbd5.cpp
+  gmosmb1.cpp
+  gmosmb2.cpp
+  gmosqsh1.cpp
+  gmosqsh2.cpp
+  gmosqsh3.cpp
+  gmosqsh4.cpp
+  gmosqsh5.cpp
+  gmowcat1.cpp
+  gmowcat2.cpp
+  gmowcat3.cpp
+  gmowcat4.cpp
+  gmowcat5.cpp
+  gmoxbbs1.cpp
+  gmoxbbs2.cpp
+  gmoxbbs3.cpp
+  gmoxbbs4.cpp
+  gmoxbbs5.cpp
+)
+include_directories(../gall ../gcfg ../gcui ../smblib ../glibc)
+ADD_LIBRARY(gmb3 STATIC ${gmb3_SOURCES})

goldlib/hunspell/CMakeLists.txt

@@ -0,0 +1,11 @@
+set(hunspell_SOURCES
+  affentry.cxx
+  affixmgr.cxx
+  csutil.cxx
+  dictmgr.cxx
+  hashmgr.cxx
+  hunspell.cxx
+  suggmgr.cxx
+  utf_info.cxx
+)
+ADD_LIBRARY(hunspell STATIC ${hunspell_SOURCES})

goldlib/smblib/CMakeLists.txt

@@ -0,0 +1,7 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(smblib_SOURCES
+  lzh.cpp
+  smblib.cpp
+)
+include_directories(../gall)
+ADD_LIBRARY(smblib STATIC ${smblib_SOURCES})

goldlib/uulib/CMakeLists.txt

@@ -0,0 +1,14 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(uulib_SOURCES
+  fptools.cpp
+  uucheck.cpp
+  uuencode.cpp
+  uulib.cpp
+  uunconc.cpp
+  uuscan.cpp
+  uustring.cpp
+  uuutil.cpp
+)
+add_definitions(-DHAVE_CONFIG_H)
+include_directories(../gall ../glibc)
+ADD_LIBRARY(uulib STATIC ${uulib_SOURCES})

goldnode/CMakeLists.txt

@@ -0,0 +1,11 @@
+set(goldnode_SOURCES
+  goldnode.cpp
+  ../golded3/golded3.cpp
+)
+add_executable(goldnode ${goldnode_SOURCES})
+target_link_libraries(goldnode gall)
+include_directories(../goldlib/gall ../golded3)
+
+INSTALL(TARGETS goldnode
+  RUNTIME DESTINATION bin
+)

rddt/CMakeLists.txt

@@ -0,0 +1,11 @@
+set(rddt_SOURCES
+  rddt.cpp
+  ../golded3/golded3.cpp
+)
+add_executable(rddt ${rddt_SOURCES})
+target_link_libraries(rddt gall)
+include_directories(../goldlib/gall ../golded3)
+
+INSTALL(TARGETS rddt
+  RUNTIME DESTINATION bin
+)