Merge pull request #33 from mjcheetham/dsym-archive

Produce and collect symbols on build

Author: mjcheetham

.azure-pipelines/templates/osx/pack.signed/step1-layout.yml

@@ -1,9 +1,15 @@
 steps:
-  - script: src/osx/Installer.Mac/layout.sh --configuration='$(configuration)' --output='$(Build.StagingDirectory)/payload'
+  - script: src/osx/Installer.Mac/layout.sh --configuration='$(configuration)' --output='$(Build.StagingDirectory)/payload' --symbol-output='$(Build.StagingDirectory)/symbols'
     displayName: Layout installer payload
 
   - task: PublishPipelineArtifact@0
     displayName: Upload unsigned payload
     inputs:
       artifactName: 'tmp.macpayload_unsigned' 
       targetPath: '$(Build.StagingDirectory)/payload'
+
+  - task: PublishPipelineArtifact@0
+    displayName: Upload symbols
+    inputs:
+      artifactName: 'Symbols.Mac'
+      targetPath: '$(Build.StagingDirectory)/symbols'

src/osx/Installer.Mac/layout.sh

@@ -39,6 +39,9 @@ case $i in
     PAYLOAD="${i#*=}"
     shift # past argument=value
     ;;
+    --symbol-output=*)
+    SYMBOLOUT="${i#*=}"
+    ;;
     *)
           # unknown option
     ;;
@@ -50,7 +53,12 @@ CONFIGURATION=${CONFIGURATION:=Debug}
 if [ -z "$PAYLOAD" ]; then
 	die "--output was not set"
 fi
+if [ -z "$SYMBOLOUT" ]; then
+    SYMBOLOUT="$PAYLOAD.sym"
+fi
+
 MSAUTH_BIN=$MSAUTH_OUT/bin/$CONFIGURATION/native
+MSAUTH_SYM=$MSAUTH_OUT/bin/$CONFIGURATION/native.sym
 if [ ! -d $MSAUTH_BIN ]; then
 	die "No native helper binaries found. Did you build?"
 fi
@@ -61,8 +69,8 @@ if [ -d $PAYLOAD ]; then
     rm -rf $PAYLOAD
 fi
 
-# Ensure payload directory exists
-mkdir -p $PAYLOAD
+# Ensure payload and symbol directories exists
+mkdir -p $PAYLOAD $SYMBOLOUT
 
 # Copy uninstaller script
 echo "Copying uninstall script..."
@@ -80,6 +88,12 @@ dotnet publish $GCM_SRC \
 	--runtime=$RUNTIME \
 	--output=$(make_absolute $PAYLOAD) || exit 1
 
+# Collect symbols
+echo "Collecting managed symbols..."
+mv $PAYLOAD/*.pdb $SYMBOLOUT || exit 1
+echo "Collecting native symbols..."
+cp -R $MSAUTH_SYM/ $SYMBOLOUT || exit 1
+
 # Remove any unwanted .DS_Store files
 echo "Removing unnecessary files..."
 find $PAYLOAD -name '*.DS_Store' -type f -delete || exit 1

src/osx/Microsoft.Authentication.Helper.Mac/Microsoft.Authentication.Helper.xcodeproj/project.pbxproj

@@ -368,6 +368,7 @@
 			baseConfigurationReference = D575DD7FD75AFA3F9B59DF88 /* Pods-Microsoft.Authentication.Helper.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -377,6 +378,7 @@
 			baseConfigurationReference = 2617F1D56611A7524A6B795A /* Pods-Microsoft.Authentication.Helper.release.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

src/osx/Microsoft.Authentication.Helper.Mac/build.sh

@@ -32,6 +32,7 @@ done
 CONFIGURATION=${CONFIGURATION:=Debug}
 
 MSAUTH_BINOUT=$MSAUTH_OUT/bin/$CONFIGURATION/native
+MSAUTH_SYMOUT=$MSAUTH_OUT/bin/$CONFIGURATION/native.sym
 MSAUTH_OBJOUT=$MSAUTH_OUT/xcodebuild
 
 # Ensure output directories exist
@@ -53,10 +54,16 @@ xcodebuild \
     -configuration $CONFIGURATION \
     -derivedDataPath $MSAUTH_OBJOUT || exit 1
 
+MSAUTH_EXEC=$MSAUTH_OBJOUT/Build/Products/$CONFIGURATION/Microsoft.Authentication.Helper
+
 # Copy binaries
 echo "Copying binaries..."
-MSAUTH_EXEC=$MSAUTH_OBJOUT/Build/Products/$CONFIGURATION/Microsoft.Authentication.Helper
 mkdir -p $MSAUTH_BINOUT || exit 1
 cp $MSAUTH_EXEC $MSAUTH_BINOUT || exit 1
 
+# Copy dSYM symbol files
+echo "Copying symbols..."
+mkdir -p $MSAUTH_SYMOUT || exit 1
+cp -R $MSAUTH_EXEC.dSYM $MSAUTH_SYMOUT || exit 1
+
 echo "Build of Microsoft.Authentication.Helper.Mac complete."