Set version into Info.plist, don't manually configure

cmake already treats the info plist as a file to be configured (not
merely copied) so we don't need to configure_file ourselves to a temp
file.

CMakeLists.txt

@@ -26,6 +26,12 @@ project(lokinet
     DESCRIPTION "lokinet - IP packet onion router"
     LANGUAGES ${LANGS})
 
+if(APPLE)
+    # Apple build number: must be incremented to submit a new build for the same lokinet version,
+    # should be reset to 0 when the lokinet version increments.
+    set(LOKINET_APPLE_BUILD 0)
+endif()
+
 set(RELEASE_MOTTO "A Series of Tubes" CACHE STRING "Release motto")
 
 add_definitions(-DLLARP_VERSION_MAJOR=${lokinet_VERSION_MAJOR})

contrib/macos/Info.plist.in

@@ -17,8 +17,8 @@
     <key>CFBundlePackageType</key>
     <string>XPC!</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.1</string>
+    <string>@LOKINET_VERSION@</string>
     <key>CFBundleVersion</key>
-    <string>0.1</string>
+    <string>@LOKINET_VERSION@.@LOKINET_APPLE_BUILD@</string>
   </dict>
 </plist>

daemon/CMakeLists.txt

@@ -97,7 +97,7 @@ if(APPLE)
     MACOSX_BUNDLE_LONG_VERSION_STRING "${lokinet_VERSION}"
     MACOSX_BUNDLE_SHORT_VERSION_STRING "${lokinet_VERSION_MAJOR}.${lokinet_VERSION_MINOR}"
     MACOSX_BUNDLE_GUI_IDENTIFIER "com.loki-project.lokinet"
-    MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/contrib/macos/Info.plist"
+    MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/contrib/macos/Info.plist.in"
     MACOSX_BUNDLE_ICON_FILE "${CMAKE_CURRENT_BINARY_DIR}/lokinet.icns"
     MACOSX_BUNDLE_COPYRIGHT "© 2021, The Oxen Project")
   if (CODESIGN_KEY)

llarp/CMakeLists.txt

@@ -280,14 +280,11 @@ if(APPLE)
     ${COREFOUNDATION}
     ${NETEXT})
 
-  configure_file(${PROJECT_SOURCE_DIR}/contrib/macos/LokinetExtension.Info.plist.in
-    ${CMAKE_CURRENT_BINARY_DIR}/LokinetExtension.Info.plist @ONLY)
-  
   set_target_properties(lokinet-extension PROPERTIES
     FRAMEWORK TRUE
     FRAMEWORK_VERSION ${lokinet_VERSION}
     MACOSX_FRAMEWORK_IDENTIFIER com.loki-project.lokinet.network-extension
-    MACOSX_FRAMEWORK_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/LokinetExtension.Info.plist
+    MACOSX_FRAMEWORK_INFO_PLIST ${PROJECT_SOURCE_DIR}/contrib/macos/LokinetExtension.Info.plist.in
     # "current version" in semantic format in Mach-O binary file
     VERSION ${lokinet_VERSION}
     # "compatibility version" in semantic format in Mach-O binary file