Merge pull request #119 from issp-center-dev/stdface_submodule

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/StdFace/submodule"]
-	path = src/StdFace/submodule
+[submodule "src/StdFace"]
+	path = src/StdFace
 	url = https://github.com/issp-center-dev/StdFace

CMakeLists.txt

@@ -29,14 +29,11 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_MACOSX_RPATH 1)
 
 if(NOT STDFACE_DIR)
+  set(STDFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace")
   # git submodule update
   # ref: https://cliutils.gitlab.io/modern-cmake/chapters/projects/submodule.html
   find_package(Git QUIET)
-  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/clone")
-    set(STDFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/clone")
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace")
-  elseif(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-    set(STDFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/submodule")
+  if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
     # Update submodules as needed
     if(GIT_SUBMODULE_UPDATE)
       message(STATUS "Submodule update")
@@ -47,13 +44,9 @@ if(NOT STDFACE_DIR)
         message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
       endif()
     endif()
-  else()
-    set(STDFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/clone")
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace")
   endif()
-
   if(NOT EXISTS "${STDFACE_DIR}/CMakeLists.txt")
-    message(FATAL_ERROR "Automatic download of the submodule StdFace failed! Please run 'sh ${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/download.sh' to download manually.")
+    message(FATAL_ERROR "StdFace is not found. Please `git clone` the repository (https://github.com/issp-center-dev/HPhi) or download an archive file (HPhi-X.Y.Z.tar.gz) from the release page (https://github.com/issp-center-dev/HPhi/releases)")
   endif()
 else()
   if(NOT EXISTS "${STDFACE_DIR}/CMakeLists.txt")

dist.sh

@@ -1,39 +1,38 @@
 #!/bin/sh
 #
-# #############  Note  ################################
-# Before packing, you should clean the GIT directory as
-# $ git clean -f -d -x
-# #####################################################
+# #############  README  ##############
+# This makes an archive file including static copy of submodules (StdFace)
+# and PDF formatted documents docs/userguide_HPhi_(ja|en).pdf
+# The output filename is HPhi-${vid}.tar.gz,
+# where ${vid} is the version number such as 3.5.0 .
+# Before using this, install the following python packages:
+#   sphinx
+#   sphinx_numfig
+#   sphinxcontib_spelling
+#   git-archive-all
+# #####################################
 #
 # Version ID
 #
 major=`cat src/include/version_major.h`
 minor=`cat src/include/version_minor.h`
 patch=`cat src/include/version_patch.h`
 vid=`echo ${major}.${minor}.${patch}`
-#
-mkdir HPhi-${vid}
-#
-#cp -rf * HPhi-${vid}
-rsync --exclude HPhi-${vid} -a * HPhi-${vid}
-#
+
+ROOTDIR=`pwd`
+
 # Build docments
-#
-cd HPhi-${vid}/doc/ja
+cd doc/ja
 make latexpdf
-cp ./build/latex/userguide_HPhi_ja.pdf ../../
+cp ./build/latex/userguide_HPhi_ja.pdf $ROOTDIR/doc
 cd ../en
 make latexpdf
-cp ./build/latex/userguide_HPhi_en.pdf ../../
-#
-# Remove some files
-#
-find ./ -name ".git*" -delete
-#
-# Pack
-#
-cd ../../
-rm dist.sh
-cd ../
-tar czvf HPhi-${vid}.tar.gz HPhi-${vid}
-rm -rf HPhi-${vid}
+cp ./build/latex/userguide_HPhi_en.pdf $ROOTDIR/doc
+
+# Make a tarball
+cd $ROOTDIR
+git-archive-all \
+  --extra=doc/userguide_HPhi_ja.pdf \
+  --extra=doc/userguide_HPhi_en.pdf \
+  --prefix=HPhi-${vid} \
+  HPhi-${vid}.tar.gz